Skip to content

Fixing the DriverRepoPackage to consider the metadata file as a file #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 11, 2013
Merged

Fixing the DriverRepoPackage to consider the metadata file as a file #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions articlegenerator/extract.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,12 @@ def collect(self):
# Get kernel version
data_rec['kernel_version'] = drp.get_kernel_version()

# Get metadata md5
data_rec['metadata_md5'] = drp.get_metadata_md5()
metadata = drp.get_metadata_file()
# Get metadata file
data_rec['metadata_file'] = {
'filename': metadata.get_filename(),
'data': metadata.get_contents(),
}

# Get RPM information
rpm_data = []
Expand Down
11 changes: 9 additions & 2 deletions articlegenerator/tests/extract_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,13 @@ def setUp(self):
'filesize': '59693',
},
'ctx': 'CTXTestNumber',
'metadata_md5': 'metadata_md5',
'metadata_file': {
'filename': 'test.metadata.md5',
'fileloc': '/tmp/test.metadata.md5',
'data': '23523582358235235',
'md5': 'asdfasdfasdf',
'filesize': '124124',
},
'driver_rpms': [
{
'filename':'test-rpm-1.rpm',
Expand Down Expand Up @@ -111,7 +117,8 @@ def test_get_iso(self):
self.assertEqual(data['zip']['md5'], mock_data['zip']['md5'])

self.assertEqual(data['kernel_version'], mock_data['kernel_version'])
self.assertEqual(data['metadata_md5'], mock_data['metadata_md5'])
self.assertEqual(data['metadata_file']['filename'], mock_data['metadata_file']['filename'])
self.assertEqual(data['metadata_file']['data'], mock_data['metadata_file']['data'])

#Verify RPM data
assert len(mock_data['driver_rpms']) + \
Expand Down
4 changes: 2 additions & 2 deletions driverfiles/mock_models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ def get_zip(self):
def get_ctx(self):
return self.mock_rec['ctx']

def get_metadata_md5(self):
return self.mock_rec['metadata_md5']
def get_metadata_file(self):
return MockBinaryFile(self.mock_rec['metadata_file'])

def get_rpms(self):
driver_rpms = []
Expand Down
4 changes: 2 additions & 2 deletions driverfiles/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,8 @@ def get_zip(self):
def get_ctx(self):
return self.attrs.group('ctx')

def get_metadata_md5(self):
return self.metadata_file.get_contents()
def get_metadata_file(self):
return self.metadata_file

def get_rpms(self):
driver_rpms = []
Expand Down
2 changes: 1 addition & 1 deletion driverfiles/tests/file_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ def test_get_zip(self):

def test_get_metadata_md5(self):
drp = models.DriverRepoPackage(self.directory)
metadata_md5 = drp.get_metadata_md5()
metadata_md5 = drp.get_metadata_file().get_contents()
assert_equal(self.sample_data['metadata_md5'], metadata_md5)

def test_verify_driver_versions(self):
Expand Down