Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 11 additions & 11 deletions libpermian/plugins/anaconda_webui/test_installationsource.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,22 +36,22 @@ def test_conversion_rhel(self):
mock_compose = MockComposeStructure('RHEL', ('AppStream', 'BaseOS', 'CRB'))
installation_source = InstallationSourceStructure.from_compose(mock_compose)

self.assertEquals(installation_source.kernel_path('x86_64'), 'http://example.com/BaseOS/x86_64/linux')
self.assertEquals(installation_source.initrd_path('x86_64'), 'http://example.com/BaseOS/x86_64/initrd')
self.assertEquals(installation_source.kernel_path('aarch64'), 'http://example.com/BaseOS/aarch64/linux')
self.assertEquals(installation_source.initrd_path('aarch64'), 'http://example.com/BaseOS/aarch64/initrd')
self.assertEqual(installation_source.kernel_path('x86_64'), 'http://example.com/BaseOS/x86_64/linux')
self.assertEqual(installation_source.initrd_path('x86_64'), 'http://example.com/BaseOS/x86_64/initrd')
self.assertEqual(installation_source.kernel_path('aarch64'), 'http://example.com/BaseOS/aarch64/linux')
self.assertEqual(installation_source.initrd_path('aarch64'), 'http://example.com/BaseOS/aarch64/initrd')

self.assertEquals(installation_source.base_repo['x86_64']['os'], 'http://example.com/BaseOS/x86_64/os')
self.assertEqual(installation_source.base_repo['x86_64']['os'], 'http://example.com/BaseOS/x86_64/os')

self.assertEquals(installation_source.repos['AppStream']['x86_64'], {"os": "http://example.com/AppStream/x86_64/os"})
self.assertEqual(installation_source.repos['AppStream']['x86_64'], {"os": "http://example.com/AppStream/x86_64/os"})

def test_conversion_fedora(self):
mock_compose = MockComposeStructure('Fedora', ('Everything',))
installation_source = InstallationSourceStructure.from_compose(mock_compose)

self.assertEquals(installation_source.kernel_path('x86_64'), 'http://example.com/Everything/x86_64/linux')
self.assertEquals(installation_source.initrd_path('x86_64'), 'http://example.com/Everything/x86_64/initrd')
self.assertEquals(installation_source.kernel_path('aarch64'), 'http://example.com/Everything/aarch64/linux')
self.assertEquals(installation_source.initrd_path('aarch64'), 'http://example.com/Everything/aarch64/initrd')
self.assertEqual(installation_source.kernel_path('x86_64'), 'http://example.com/Everything/x86_64/linux')
self.assertEqual(installation_source.initrd_path('x86_64'), 'http://example.com/Everything/x86_64/initrd')
self.assertEqual(installation_source.kernel_path('aarch64'), 'http://example.com/Everything/aarch64/linux')
self.assertEqual(installation_source.initrd_path('aarch64'), 'http://example.com/Everything/aarch64/initrd')

self.assertEquals(installation_source.base_repo['x86_64']['os'], 'http://example.com/Everything/x86_64/os')
self.assertEqual(installation_source.base_repo['x86_64']['os'], 'http://example.com/Everything/x86_64/os')
4 changes: 2 additions & 2 deletions libpermian/plugins/everything_event/test_everything.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ def test_additional_testplan(self):
}'''

event = EventFactory.make(self.settings, event_string)
self.assertEquals(event.additional_testplans_data,
self.assertEqual(event.additional_testplans_data,
[{'name': 'Everything',
'point_person': 'tester@example.com',
'artifact_type': 'everything',
Expand All @@ -42,7 +42,7 @@ def test_additional_testplan_reporting(self):
}
}'''
event = EventFactory.make(self.settings, event_string)
self.assertEquals(event.additional_testplans_data,
self.assertEqual(event.additional_testplans_data,
[{'name': 'Everything',
'point_person': 'tester@example.com',
'artifact_type': 'everything',
Expand Down
10 changes: 10 additions & 0 deletions libpermian/testruns/test_testruns.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@ def tearDownClass(cls):
WorkflowFactory.restore_workflow_classes()

def test_isolated(self):
workflow1 = None
workflow2 = None
for caserun in self.testruns.caseRunConfigurations:
if caserun.testcase.name == 'test_isolated 1':
workflow1 = caserun.workflow
Expand All @@ -83,6 +85,9 @@ def test_isolated(self):
self.assertNotEqual(workflow1, workflow2)

def test_grouped_all(self):
workflow1 = None
workflow2 = None
workflow3 = None
for caserun in self.testruns.caseRunConfigurations:
if caserun.testcase.name == 'test_grouped 1':
workflow1 = caserun.workflow
Expand All @@ -98,13 +103,15 @@ def test_grouped_all(self):
self.assertEqual(workflow2, workflow3)

def test_manual(self):
workflow = None
for caserun in self.testruns.caseRunConfigurations:
if caserun.testcase.name == 'testcase 1':
workflow = caserun.workflow

self.assertIsInstance(workflow, ManualWorkflow)

def test_unknown(self):
workflow = None
for caserun in self.testruns.caseRunConfigurations:
if caserun.testcase.name == 'testcase 2':
workflow = caserun.workflow
Expand All @@ -124,6 +131,9 @@ def tearDownClass(cls):
WorkflowFactory.restore_workflow_classes()

def test_grouped_by_config(self):
workflow1 = None
workflow2 = None
workflow3 = None
for caserun in self.testruns.caseRunConfigurations:
if caserun.testcase.name == 'test_grouped 1':
workflow1 = caserun.workflow
Expand Down
Loading