Skip to content

Fix AssertEquals deprecation warnings #128

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 2 commits into from
Mar 21, 2022
Merged

Fix AssertEquals deprecation warnings #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1688519
Fix AssertEquals deprecation warnings
Mar 18, 2022
5b90ff3
Merge branch 'master' into bankiel-deprecationfix
benank Mar 21, 2022
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
10 changes: 5 additions & 5 deletions src/core/tests/Test_AptitudePackageManager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ def test_install_package_success(self):
self.assertIsNotNone(package_manager)

# test for successfully installing a package
self.assertEquals(package_manager.install_update_and_dependencies('selinux-policy.noarch', '3.13.1-102.el7_3.16', simulate=True), Constants.INSTALLED) # needs to be fixed
self.assertEqual(package_manager.install_update_and_dependencies('selinux-policy.noarch', '3.13.1-102.el7_3.16', simulate=True), Constants.INSTALLED) # needs to be fixed

def test_is_installed_check_with_dpkg(self):
self.runtime.set_legacy_test_type('SuccessInstallPath')
Expand All @@ -96,8 +96,8 @@ def test_is_installed_check_with_dpkg(self):
self.assertIsNotNone(package_manager)

# test for successfully installing a package
self.assertEquals(package_manager.is_package_version_installed('mysql-server', '5.7.25-0ubuntu0.16.04.2'), True)
self.assertEquals(package_manager.is_package_version_installed('mysql-client', '5.7.25-0ubuntu0.16.04.2'), False)
self.assertEqual(package_manager.is_package_version_installed('mysql-server', '5.7.25-0ubuntu0.16.04.2'), True)
self.assertEqual(package_manager.is_package_version_installed('mysql-client', '5.7.25-0ubuntu0.16.04.2'), False)

def test_install_package_failure(self):
self.runtime.set_legacy_test_type('FailInstallPath')
Expand All @@ -106,7 +106,7 @@ def test_install_package_failure(self):
self.assertIsNotNone(package_manager)

# test for unsuccessfully installing a package
self.assertEquals(package_manager.install_update_and_dependencies('selinux-policy.noarch', '3.13.1-102.el7_3.16', simulate=True), Constants.FAILED)
self.assertEqual(package_manager.install_update_and_dependencies('selinux-policy.noarch', '3.13.1-102.el7_3.16', simulate=True), Constants.FAILED)
self.assertRaises(Exception, lambda: package_manager.invoke_package_manager('sudo apt-get -y --only-upgrade true install force-dpkg-failure'))

def test_install_package_only_upgrades(self):
Expand All @@ -116,7 +116,7 @@ def test_install_package_only_upgrades(self):
self.assertIsNotNone(package_manager)

# test for unsuccessfully installing a package
self.assertEquals(package_manager.install_update_and_dependencies('iucode-tool', '1.5.1-1ubuntu0.1', simulate=True), Constants.PENDING)
self.assertEqual(package_manager.install_update_and_dependencies('iucode-tool', '1.5.1-1ubuntu0.1', simulate=True), Constants.PENDING)

def test_disable_auto_os_update_with_two_patch_modes_enabled_success(self):
package_manager = self.container.get('package_manager')
Expand Down
12 changes: 6 additions & 6 deletions src/core/tests/Test_ConfigurePatchingProcessor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ def test_operation_success_for_configure_patching_request_for_apt(self):

# check status file for configure patching patch state
self.assertTrue(runtime.package_manager.image_default_patch_configuration_backup_exists())
self.assertEquals(len(substatus_file_data), 1)
self.assertEqual(len(substatus_file_data), 1)
self.assertTrue(substatus_file_data[0]["name"] == Constants.CONFIGURE_PATCHING_SUMMARY)
self.assertTrue(substatus_file_data[0]["status"].lower() == Constants.STATUS_SUCCESS.lower())
message = json.loads(substatus_file_data[0]["formattedMessage"]["message"])
Expand Down Expand Up @@ -110,7 +110,7 @@ def test_operation_success_for_installation_request_with_configure_patching(self
self.assertTrue(substatus_file_data[3]["name"] == Constants.CONFIGURE_PATCHING_SUMMARY)
self.assertTrue(substatus_file_data[3]["status"].lower() == Constants.STATUS_SUCCESS.lower())

self.assertEquals(len(substatus_file_data), 4)
self.assertEqual(len(substatus_file_data), 4)
self.assertTrue(substatus_file_data[0]["name"] == Constants.PATCH_ASSESSMENT_SUMMARY)
self.assertTrue(substatus_file_data[0]["status"].lower() == Constants.STATUS_SUCCESS.lower())
self.assertTrue(substatus_file_data[1]["name"] == Constants.PATCH_INSTALLATION_SUMMARY)
Expand Down Expand Up @@ -141,7 +141,7 @@ def test_operation_fail_for_configure_patching_agent_incompatible(self):
# check status file
with runtime.env_layer.file_system.open(runtime.execution_config.status_file_path, 'r') as file_handle:
substatus_file_data = json.load(file_handle)[0]["status"]["substatus"]
self.assertEquals(len(substatus_file_data), 1)
self.assertEqual(len(substatus_file_data), 1)
self.assertTrue(substatus_file_data[0]["name"] == Constants.CONFIGURE_PATCHING_SUMMARY)
if runtime.vm_cloud_type == Constants.VMCloudType.AZURE:
self.assertTrue(substatus_file_data[0]["status"].lower() == Constants.STATUS_ERROR.lower())
Expand All @@ -167,7 +167,7 @@ def test_operation_fail_for_configure_patching_request_for_apt(self):
# check status file
with runtime.env_layer.file_system.open(runtime.execution_config.status_file_path, 'r') as file_handle:
substatus_file_data = json.load(file_handle)[0]["status"]["substatus"]
self.assertEquals(len(substatus_file_data), 1)
self.assertEqual(len(substatus_file_data), 1)
self.assertTrue(substatus_file_data[0]["name"] == Constants.CONFIGURE_PATCHING_SUMMARY)
self.assertTrue(substatus_file_data[0]["status"].lower() == Constants.STATUS_ERROR.lower())
runtime.stop()
Expand Down Expand Up @@ -201,7 +201,7 @@ def test_configure_patching_with_assessment_mode_by_platform(self):
substatus_file_data = json.load(file_handle)[0]["status"]["substatus"]

# check status file for configure patching patch state
self.assertEquals(len(substatus_file_data), 1)
self.assertEqual(len(substatus_file_data), 1)
self.assertTrue(substatus_file_data[0]["name"] == Constants.CONFIGURE_PATCHING_SUMMARY)
self.assertTrue(substatus_file_data[0]["status"].lower() == Constants.STATUS_SUCCESS.lower())
message = json.loads(substatus_file_data[0]["formattedMessage"]["message"])
Expand Down Expand Up @@ -244,7 +244,7 @@ def test_configure_patching_with_patch_mode_and_assessment_mode_by_platform(self

# check status file for configure patching patch state
self.assertTrue(runtime.package_manager.image_default_patch_configuration_backup_exists())
self.assertEquals(len(substatus_file_data), 1)
self.assertEqual(len(substatus_file_data), 1)
self.assertTrue(substatus_file_data[0]["name"] == Constants.CONFIGURE_PATCHING_SUMMARY)
self.assertTrue(substatus_file_data[0]["status"].lower() == Constants.STATUS_SUCCESS.lower())
message = json.loads(substatus_file_data[0]["formattedMessage"]["message"])
Expand Down
Loading