From 38513f7dc5e73b3cbe520eba336f9088a7850160 Mon Sep 17 00:00:00 2001 From: Tetiana Lashchova Date: Tue, 29 Sep 2015 15:20:16 +0300 Subject: [PATCH] Fix order of arguments in assertEqual Some tests used incorrect order of arguments in assertEqual. The correct order expected by testtools is assertEqual(expected, observed). Change-Id: I210ce20cb9427799219e8aedb9ee3282dea53d3f Closes-Bug: #1259292 --- murano/tests/unit/api/cmd/test_test_runner.py | 2 +- murano/tests/unit/api/v1/test_actions.py | 6 +- murano/tests/unit/api/v1/test_catalog.py | 66 ++++++++--------- murano/tests/unit/api/v1/test_sessions.py | 2 +- .../common/helpers/test_token_sanitizer.py | 14 ++-- .../tests/unit/common/test_traverse_helper.py | 16 ++--- .../unit/db/services/test_core_service.py | 12 ++-- .../unit/db/services/test_environments.py | 2 +- .../db/services/test_templates_service.py | 10 +-- murano/tests/unit/db/test_catalog.py | 70 +++++++++---------- murano/tests/unit/dsl/test_contracts.py | 12 ++-- murano/tests/unit/dsl/test_execution.py | 10 +-- murano/tests/unit/engine/system/test_agent.py | 10 +-- .../packages/hot_package/test_hot_package.py | 2 +- .../unit/packages/versions/test_hot_v1.py | 21 +++--- .../unit/packages/versions/test_mpl_v1.py | 21 +++--- 16 files changed, 137 insertions(+), 139 deletions(-) diff --git a/murano/tests/unit/api/cmd/test_test_runner.py b/murano/tests/unit/api/cmd/test_test_runner.py index 8b875ed8..c23babf3 100644 --- a/murano/tests/unit/api/cmd/test_test_runner.py +++ b/murano/tests/unit/api/cmd/test_test_runner.py @@ -145,7 +145,7 @@ class TestCaseShell(testtools.TestCase): def test_package_is_not_provided(self): _, stderr = self.shell(exitcode=1) - self.assertEqual(stderr, 'ERROR: Package name is required parameter.') + self.assertEqual('ERROR: Package name is required parameter.', stderr) def test_wrong_parent(self): _, stderr = self.shell( diff --git a/murano/tests/unit/api/v1/test_actions.py b/murano/tests/unit/api/v1/test_actions.py index 92eb332b..2f0e0886 100644 --- a/murano/tests/unit/api/v1/test_actions.py +++ b/murano/tests/unit/api/v1/test_actions.py @@ -126,8 +126,8 @@ class TestActionsApi(tb.ControllerTest, tb.MuranoApiTestCase): response = request.get_response(self.api) - self.assertEqual(response.status_code, 200) - self.assertEqual(response.json, expected_result) + self.assertEqual(200, response.status_code) + self.assertEqual(expected_result, response.json) def test_get_result_not_found(self, _): """If task does not exists, it should be handled correctly @@ -150,4 +150,4 @@ class TestActionsApi(tb.ControllerTest, tb.MuranoApiTestCase): response = request.get_response(self.api) - self.assertEqual(response.status_code, 404) + self.assertEqual(404, response.status_code) diff --git a/murano/tests/unit/api/v1/test_catalog.py b/murano/tests/unit/api/v1/test_catalog.py index 7f744bc2..ddac344d 100644 --- a/murano/tests/unit/api/v1/test_catalog.py +++ b/murano/tests/unit/api/v1/test_catalog.py @@ -67,41 +67,41 @@ class TestCatalogApi(test_base.ControllerTest, test_base.MuranoApiTestCase): result = self.controller.search(self._get( '/v1/catalog/packages/', params={'catalog': 'False', 'owned': 'False'})) - self.assertEqual(len(result['packages']), 4) + self.assertEqual(4, len(result['packages'])) result = self.controller.search(self._get( '/v1/catalog/packages/', params={'catalog': 'False', 'owned': 'True'})) - self.assertEqual(len(result['packages']), 2) + self.assertEqual(2, len(result['packages'])) result = self.controller.search(self._get( '/v1/catalog/packages/', params={'catalog': 'True', 'owned': 'False'})) - self.assertEqual(len(result['packages']), 3) + self.assertEqual(3, len(result['packages'])) result = self.controller.search(self._get( '/v1/catalog/packages/', params={'catalog': 'True', 'owned': 'True'})) - self.assertEqual(len(result['packages']), 2) + self.assertEqual(2, len(result['packages'])) result = self.controller.search(self._get( '/v1/catalog/packages/', params={ 'owned': 'True', 'fqn': pkg.fully_qualified_name})) - self.assertEqual(len(result['packages']), 1) - self.assertEqual(result['packages'][0]['fully_qualified_name'], - pkg.fully_qualified_name) + self.assertEqual(1, len(result['packages'])) + self.assertEqual(pkg.fully_qualified_name, + result['packages'][0]['fully_qualified_name']) result = self.controller.search(self._get( '/v1/catalog/packages/', params={ 'owned': 'True', 'type': 'Library'})) - self.assertEqual(len(result['packages']), 1) - self.assertEqual(result['packages'][0]['fully_qualified_name'], - pkg.fully_qualified_name) + self.assertEqual(1, len(result['packages'])) + self.assertEqual(pkg.fully_qualified_name, + result['packages'][0]['fully_qualified_name']) result = self.controller.search(self._get( '/v1/catalog/packages/', params={ 'type': 'Library'})) - self.assertEqual(len(result['packages']), 2) + self.assertEqual(2, len(result['packages'])) def test_packages_filtering_non_admin(self): self.is_admin = False @@ -121,46 +121,46 @@ class TestCatalogApi(test_base.ControllerTest, test_base.MuranoApiTestCase): result = self.controller.search(self._get( '/v1/catalog/packages/', params={'catalog': 'False', 'owned': 'False'})) - self.assertEqual(len(result['packages']), 3) + self.assertEqual(3, len(result['packages'])) result = self.controller.search(self._get( '/v1/catalog/packages/', params={'catalog': 'False', 'owned': 'True'})) - self.assertEqual(len(result['packages']), 2) + self.assertEqual(2, len(result['packages'])) result = self.controller.search(self._get( '/v1/catalog/packages/', params={'catalog': 'True', 'owned': 'False'})) - self.assertEqual(len(result['packages']), 3) + self.assertEqual(3, len(result['packages'])) result = self.controller.search(self._get( '/v1/catalog/packages/', params={'catalog': 'True', 'owned': 'True'})) - self.assertEqual(len(result['packages']), 2) + self.assertEqual(2, len(result['packages'])) result = self.controller.search(self._get( '/v1/catalog/packages/', params={ 'owned': 'True', 'fqn': pkg.fully_qualified_name})) - self.assertEqual(len(result['packages']), 1) - self.assertEqual(result['packages'][0]['fully_qualified_name'], - pkg.fully_qualified_name) + self.assertEqual(1, len(result['packages'])) + self.assertEqual(pkg.fully_qualified_name, + result['packages'][0]['fully_qualified_name']) result = self.controller.search(self._get( '/v1/catalog/packages/', params={ 'owned': 'True', 'type': 'Library'})) - self.assertEqual(len(result['packages']), 1) - self.assertEqual(result['packages'][0]['fully_qualified_name'], - pkg.fully_qualified_name) + self.assertEqual(1, len(result['packages'])) + self.assertEqual(pkg.fully_qualified_name, + result['packages'][0]['fully_qualified_name']) result = self.controller.search(self._get( '/v1/catalog/packages/', params={ 'type': 'Library'})) - self.assertEqual(len(result['packages']), 2) + self.assertEqual(2, len(result['packages'])) self._set_policy_rules({'get_package': '', 'manage_public_package': '!'}) result = self.controller.search(self._get( '/v1/catalog/packages/', params={'catalog': 'False'})) - self.assertEqual(len(result['packages']), 2) + self.assertEqual(2, len(result['packages'])) def test_packages(self): self._set_policy_rules( @@ -171,7 +171,7 @@ class TestCatalogApi(test_base.ControllerTest, test_base.MuranoApiTestCase): self.expect_policy_check('get_package') self.expect_policy_check('manage_public_package') result = self.controller.search(self._get('/v1/catalog/packages/')) - self.assertEqual(len(result['packages']), 0) + self.assertEqual(0, len(result['packages'])) self._add_pkg('test_tenant') self._add_pkg('test_tenant') @@ -181,20 +181,20 @@ class TestCatalogApi(test_base.ControllerTest, test_base.MuranoApiTestCase): # non-admin should only see 2 pkgs he can edit. self.is_admin = False result = self.controller.search(self._get('/v1/catalog/packages/')) - self.assertEqual(len(result['packages']), 2) + self.assertEqual(2, len(result['packages'])) # can only deploy his + public result = self.controller.search(self._get( '/v1/catalog/packages/', params={'catalog': 'True'})) - self.assertEqual(len(result['packages']), 2) + self.assertEqual(2, len(result['packages'])) # admin can edit anything self.is_admin = True result = self.controller.search(self._get('/v1/catalog/packages/')) - self.assertEqual(len(result['packages']), 4) + self.assertEqual(4, len(result['packages'])) # admin can only deploy his + public result = self.controller.search(self._get( '/v1/catalog/packages/', params={'catalog': 'True'})) - self.assertEqual(len(result['packages']), 2) + self.assertEqual(2, len(result['packages'])) self._add_pkg('test_tenant', public=True) self._add_pkg('other_tenant', public=True) @@ -202,20 +202,20 @@ class TestCatalogApi(test_base.ControllerTest, test_base.MuranoApiTestCase): # non-admin are allowed to edit public packages by policy self.is_admin = False result = self.controller.search(self._get('/v1/catalog/packages/')) - self.assertEqual(len(result['packages']), 4) + self.assertEqual(4, len(result['packages'])) # can deploy mine + other public result = self.controller.search(self._get( '/v1/catalog/packages/', params={'catalog': 'True'})) - self.assertEqual(len(result['packages']), 4) + self.assertEqual(4, len(result['packages'])) # admin can edit anything self.is_admin = True result = self.controller.search(self._get('/v1/catalog/packages/')) - self.assertEqual(len(result['packages']), 6) + self.assertEqual(6, len(result['packages'])) # can deploy mine + public result = self.controller.search(self._get( '/v1/catalog/packages/', params={'catalog': 'True'})) - self.assertEqual(len(result['packages']), 4) + self.assertEqual(4, len(result['packages'])) def _test_package(self): package_dir = os.path.abspath( @@ -266,7 +266,7 @@ class TestCatalogApi(test_base.ControllerTest, test_base.MuranoApiTestCase): ) result = self.controller.get_supplier_logo(req, saved_package.id) - self.assertEqual(imghdr.what('', result), 'png') + self.assertEqual('png', imghdr.what('', result)) def test_download_package(self): self._set_policy_rules( diff --git a/murano/tests/unit/api/v1/test_sessions.py b/murano/tests/unit/api/v1/test_sessions.py index b5f6011b..d0197726 100644 --- a/murano/tests/unit/api/v1/test_sessions.py +++ b/murano/tests/unit/api/v1/test_sessions.py @@ -85,4 +85,4 @@ class TestSessionsApi(tb.ControllerTest, tb.MuranoApiTestCase): response = request.get_response(self.api) # Should be forbidden! - self.assertEqual(response.status_code, 403) + self.assertEqual(403, response.status_code) diff --git a/murano/tests/unit/common/helpers/test_token_sanitizer.py b/murano/tests/unit/common/helpers/test_token_sanitizer.py index cbd98efc..ce628a70 100644 --- a/murano/tests/unit/common/helpers/test_token_sanitizer.py +++ b/murano/tests/unit/common/helpers/test_token_sanitizer.py @@ -22,27 +22,27 @@ class TokenSanitizerTests(base.MuranoTestCase): def test_dict_with_one_value(self): source = {'token': 'value'} value = self.sanitizer.sanitize(source) - self.assertEqual(value['token'], self.sanitizer.message) + self.assertEqual(self.sanitizer.message, value['token']) def test_dict_with_few_value(self): source = {'token': 'value', 'pass': 'value', 'TrustId': 'value'} value = self.sanitizer.sanitize(source) - self.assertEqual(value['token'], self.sanitizer.message) - self.assertEqual(value['pass'], self.sanitizer.message) - self.assertEqual(value['TrustId'], self.sanitizer.message) + self.assertEqual(self.sanitizer.message, value['token']) + self.assertEqual(self.sanitizer.message, value['pass']) + self.assertEqual(self.sanitizer.message, value['TrustId']) def test_dict_with_nested_dict(self): source = {'obj': {'pass': 'value'}} value = self.sanitizer.sanitize(source) - self.assertEqual(value['obj']['pass'], self.sanitizer.message) + self.assertEqual(self.sanitizer.message, value['obj']['pass']) def test_dict_with_nested_list(self): source = {'obj': [{'pass': 'value'}]} value = self.sanitizer.sanitize(source) - self.assertEqual(value['obj'][0]['pass'], self.sanitizer.message) + self.assertEqual(self.sanitizer.message, value['obj'][0]['pass']) def test_leave_out_other_values(self): source = {'obj': ['value']} value = self.sanitizer.sanitize(source) - self.assertEqual(value['obj'][0], 'value') + self.assertEqual('value', value['obj'][0]) diff --git a/murano/tests/unit/common/test_traverse_helper.py b/murano/tests/unit/common/test_traverse_helper.py index 418a447a..93f99b28 100644 --- a/murano/tests/unit/common/test_traverse_helper.py +++ b/murano/tests/unit/common/test_traverse_helper.py @@ -30,17 +30,17 @@ class TraverseHelperTests(base.MuranoTestCase): def test_root_get_with_value_type(self): source = 'source' value = utils.TraverseHelper.get('/', source) - self.assertEqual(value, source) + self.assertEqual(source, value) def test_attribute_get(self): source = {'attr': True} value = utils.TraverseHelper.get('/attr', source) - self.assertEqual(value, True) + self.assertEqual(True, value) def test_nested_attribute_get(self): source = {'obj': {'attr': True}} value = utils.TraverseHelper.get('/obj/attr', source) - self.assertEqual(value, True) + self.assertEqual(True, value) def test_list_item_attribute_get(self): source = {'obj': [ @@ -48,7 +48,7 @@ class TraverseHelperTests(base.MuranoTestCase): {'?': {'id': '2s'}, 'value': 2}, ]} value = utils.TraverseHelper.get('/obj/2s/value', source) - self.assertEqual(value, 2) + self.assertEqual(2, value) def test_list_item_attribute_get_by_index(self): source = {'obj': [ @@ -56,25 +56,25 @@ class TraverseHelperTests(base.MuranoTestCase): {'?': {'id': 'guid2'}, 'value': 2} ]} value = utils.TraverseHelper.get('/obj/1/value', source) - self.assertEqual(value, 2) + self.assertEqual(2, value) def test_attribute_set(self): source = {'attr': True} utils.TraverseHelper.update('/newAttr', False, source) value = utils.TraverseHelper.get('/newAttr', source) - self.assertEqual(value, False) + self.assertEqual(False, value) def test_attribute_update(self): source = {'attr': True} utils.TraverseHelper.update('/attr', False, source) value = utils.TraverseHelper.get('/attr', source) - self.assertEqual(value, False) + self.assertEqual(False, value) def test_nested_attribute_update(self): source = {'obj': {'attr': True}} utils.TraverseHelper.update('/obj/attr', False, source) value = utils.TraverseHelper.get('/obj/attr', source) - self.assertEqual(value, False) + self.assertEqual(False, value) def test_adding_item_to_list(self): source = {'attr': [1, 2, 3]} diff --git a/murano/tests/unit/db/services/test_core_service.py b/murano/tests/unit/db/services/test_core_service.py index dd5e7719..14234b7b 100644 --- a/murano/tests/unit/db/services/test_core_service.py +++ b/murano/tests/unit/db/services/test_core_service.py @@ -34,7 +34,7 @@ class TestCoreServices(base.MuranoTestCase): template_services_mock.get_description.return_value = \ fixture.environment_template_desc template_des = self.core_services.get_template_data('any', '/services') - self.assertEqual(template_des, []) + self.assertEqual([], template_des) template_services_mock.get_description.assert_called_with('any') @mock.patch('murano.db.services.environment_templates.EnvTemplateServices') @@ -45,7 +45,7 @@ class TestCoreServices(base.MuranoTestCase): template_services_mock.get_description.return_value = \ fixture_env_apps.env_template_desc template_des = self.core_services.get_template_data('any', '/services') - self.assertEqual(template_des, fixture_apps.applications_desc) + self.assertEqual(fixture_apps.applications_desc, template_des) template_services_mock.get_description.assert_called_with('any') @mock.patch('murano.db.services.environment_templates.EnvTemplateServices') @@ -58,7 +58,7 @@ class TestCoreServices(base.MuranoTestCase): template_des = \ self.core_services.get_template_data('any', '/services/tomcat_id') - self.assertEqual(template_des, fixture2.application_tomcat_desc) + self.assertEqual(fixture2.application_tomcat_desc, template_des) template_services_mock.get_description.assert_called_with('any') @mock.patch('murano.db.services.environment_templates.EnvTemplateServices') @@ -72,7 +72,7 @@ class TestCoreServices(base.MuranoTestCase): post_env_template_data('any', fixture2.env_template_desc, '/services') - self.assertEqual(template_des, fixture2.env_template_desc) + self.assertEqual(fixture2.env_template_desc, template_des) template_services_mock.get_description.assert_called_with('any') @mock.patch('murano.db.services.environment_templates.EnvTemplateServices') @@ -86,7 +86,7 @@ class TestCoreServices(base.MuranoTestCase): delete_env_template_data('any', '/services/54aaa43d-5970') template_des = self.core_services.get_template_data('any', '/services') - self.assertEqual(template_des, [fixture.application_tomcat_desc]) + self.assertEqual([fixture.application_tomcat_desc], template_des) template_services_mock.get_description.assert_called_with('any') @mock.patch('murano.db.services.environment_templates.EnvTemplateServices') @@ -120,5 +120,5 @@ class TestCoreServices(base.MuranoTestCase): '/services') template_des = \ self.core_services.get_template_data('any', '/services') - self.assertEqual(template_des, fservices.applications_desc) + self.assertEqual(fservices.applications_desc, template_des) template_services_mock.get_description.assert_called_with('any') diff --git a/murano/tests/unit/db/services/test_environments.py b/murano/tests/unit/db/services/test_environments.py index acb1fe6e..363923e6 100644 --- a/murano/tests/unit/db/services/test_environments.py +++ b/murano/tests/unit/db/services/test_environments.py @@ -62,4 +62,4 @@ class TestEnvironmentServices(base.MuranoWithDBTestCase): environment.id ) - self.assertEqual(actual_status, expected_status) + self.assertEqual(expected_status, actual_status) diff --git a/murano/tests/unit/db/services/test_templates_service.py b/murano/tests/unit/db/services/test_templates_service.py index 99aef501..4cae83d2 100644 --- a/murano/tests/unit/db/services/test_templates_service.py +++ b/murano/tests/unit/db/services/test_templates_service.py @@ -39,8 +39,8 @@ class TestTemplateServices(base.MuranoWithDBTestCase, "name": "my_template" } template_des = self.template_services.create(body, 'tenant_id') - self.assertEqual(template_des.description, - fixture.environment_template_desc) + self.assertEqual(fixture.environment_template_desc, + template_des.description) def test_get_empty_template(self): """Check obtaining information about a template without services.""" @@ -48,17 +48,17 @@ class TestTemplateServices(base.MuranoWithDBTestCase, self.test_create_template() template = \ self.template_services.get_description("template_id") - self.assertEqual(template, fixture.environment_template_desc) + self.assertEqual(fixture.environment_template_desc, template) def test_get_template_services(self): """Check obtaining information about a template with services.""" fixture = self.useFixture(et.AppEnvTemplateFixture()) template = self.template_services.create(fixture.env_template_desc, 'tenant_id') - self.assertEqual(template.description, fixture.env_template_desc) + self.assertEqual(fixture.env_template_desc, template.description) template_des = \ self.template_services.get_description("template_id") - self.assertEqual(template_des, fixture.env_template_desc) + self.assertEqual(fixture.env_template_desc, template_des) def test_get_template_no_exists(self): """Check obtaining information about a template which diff --git a/murano/tests/unit/db/test_catalog.py b/murano/tests/unit/db/test_catalog.py index cdf223ae..47ed8f47 100644 --- a/murano/tests/unit/db/test_catalog.py +++ b/murano/tests/unit/db/test_catalog.py @@ -80,7 +80,7 @@ class CatalogDBTestCase(base.MuranoWithDBTestCase): [pkg_created, pkg_name, pkg_fqn]): res = api.package_search( {'order_by': [order]}, self.context, limit=10) - self.assertEqual(len(res), 10) + self.assertEqual(10, len(res)) self.assertEqual(pkg_ids, [r.id for r in res]) def test_order_by_compound(self): @@ -104,7 +104,7 @@ class CatalogDBTestCase(base.MuranoWithDBTestCase): res = api.package_search( {'order_by': ['name', 'created']}, self.context, limit=10) - self.assertEqual(len(res), 10) + self.assertEqual(10, len(res)) self.assertEqual(pkg_a_id + pkg_z_id, [r.id for r in res]) def test_pagination_backwards(self): @@ -122,14 +122,14 @@ class CatalogDBTestCase(base.MuranoWithDBTestCase): pkg_ids = [pkg.id for pkg in sorted(pkgs, key=lambda _pkg: _pkg.name)] res = api.package_search({}, self.context, limit=10) - self.assertEqual(len(res), 10) + self.assertEqual(10, len(res)) self.assertEqual(pkg_ids, [r.id for r in res]) marker = res[-1].id res = api.package_search( {'marker': marker, 'sort_dir': 'desc'}, self.context, limit=5) - self.assertEqual(len(res), 5) + self.assertEqual(5, len(res)) self.assertEqual(list(reversed(pkg_ids[4:9])), [r.id for r in res]) marker = res[-1].id @@ -137,7 +137,7 @@ class CatalogDBTestCase(base.MuranoWithDBTestCase): res = api.package_search( {'marker': marker, 'sort_dir': 'desc'}, self.context, limit=5) - self.assertEqual(len(res), 4) + self.assertEqual(4, len(res)) self.assertEqual(list(reversed(pkg_ids[0:4])), [r.id for r in res]) marker = res[-1].id @@ -145,7 +145,7 @@ class CatalogDBTestCase(base.MuranoWithDBTestCase): res = api.package_search( {'marker': marker, 'sort_dir': 'desc'}, self.context, limit=5) - self.assertEqual(len(res), 0) + self.assertEqual(0, len(res)) def test_pagination(self): """Creates 10 packages with unique names and iterates through them, @@ -163,22 +163,22 @@ class CatalogDBTestCase(base.MuranoWithDBTestCase): pkg_ids = [pkg.id for pkg in sorted(pkgs, key=lambda _pkg: _pkg.name)] res = api.package_search({}, self.context, limit=4) - self.assertEqual(len(res), 4) + self.assertEqual(4, len(res)) self.assertEqual(pkg_ids[0:4], [r.id for r in res]) marker = res[-1].id res = api.package_search({'marker': marker}, self.context, limit=4) - self.assertEqual(len(res), 4) + self.assertEqual(4, len(res)) self.assertEqual(pkg_ids[4:8], [r.id for r in res]) marker = res[-1].id res = api.package_search({'marker': marker}, self.context, limit=4) - self.assertEqual(len(res), 2) + self.assertEqual(2, len(res)) self.assertEqual(pkg_ids[8:10], [r.id for r in res]) marker = res[-1].id res = api.package_search({'marker': marker}, self.context, limit=4) - self.assertEqual(len(res), 0) + self.assertEqual(0, len(res)) def test_pagination_loops_through_names(self): """Creates 10 packages with the same display name and iterates through them, @@ -191,19 +191,19 @@ class CatalogDBTestCase(base.MuranoWithDBTestCase): fully_qualified_name=str(uuid.uuid4())), self.tenant_id) res = api.package_search({}, self.context, limit=4) - self.assertEqual(len(res), 4) + self.assertEqual(4, len(res)) marker = res[-1].id res = api.package_search({'marker': marker}, self.context, limit=4) - self.assertEqual(len(res), 4) + self.assertEqual(4, len(res)) marker = res[-1].id res = api.package_search({'marker': marker}, self.context, limit=4) - self.assertEqual(len(res), 2) + self.assertEqual(2, len(res)) marker = res[-1].id res = api.package_search({'marker': marker}, self.context, limit=4) - self.assertEqual(len(res), 0) + self.assertEqual(0, len(res)) def test_package_search_search(self): pkg1 = api.package_upload( @@ -216,20 +216,20 @@ class CatalogDBTestCase(base.MuranoWithDBTestCase): res = api.package_search( {'search': 'tag1'}, self.context) - self.assertEqual(len(res), 1) + self.assertEqual(1, len(res)) res = api.package_search( {'search': pkg1.fully_qualified_name}, self.context) - self.assertEqual(len(res), 1) + self.assertEqual(1, len(res)) res = api.package_search( {'search': pkg2.fully_qualified_name}, self.context) - self.assertEqual(len(res), 1) + self.assertEqual(1, len(res)) res = api.package_search( {'search': 'not_a_valid_uuid'}, self.context) - self.assertEqual(len(res), 0) + self.assertEqual(0, len(res)) res = api.package_search( {'search': 'some text'}, self.context) - self.assertEqual(len(res), 2) + self.assertEqual(2, len(res)) def test_package_search_tags(self): api.package_upload( @@ -242,13 +242,13 @@ class CatalogDBTestCase(base.MuranoWithDBTestCase): res = api.package_search( {'tag': ['tag1']}, self.context) - self.assertEqual(len(res), 1) + self.assertEqual(1, len(res)) res = api.package_search( {'tag': ['tag2']}, self.context) - self.assertEqual(len(res), 1) + self.assertEqual(1, len(res)) res = api.package_search( {'tag': ['tag3']}, self.context) - self.assertEqual(len(res), 0) + self.assertEqual(0, len(res)) def test_package_search_type(self): api.package_upload( @@ -262,10 +262,10 @@ class CatalogDBTestCase(base.MuranoWithDBTestCase): res = api.package_search( {'type': 'Library'}, self.context) - self.assertEqual(len(res), 1) + self.assertEqual(1, len(res)) res = api.package_search( {'type': 'Application'}, self.context) - self.assertEqual(len(res), 1) + self.assertEqual(1, len(res)) def test_package_search_disabled(self): api.package_upload( @@ -281,10 +281,10 @@ class CatalogDBTestCase(base.MuranoWithDBTestCase): res = api.package_search( {'include_disabled': 'false'}, self.context) - self.assertEqual(len(res), 1) + self.assertEqual(1, len(res)) res = api.package_search( {'include_disabled': 'true'}, self.context) - self.assertEqual(len(res), 2) + self.assertEqual(2, len(res)) def test_package_search_owned(self): api.package_upload( @@ -297,13 +297,13 @@ class CatalogDBTestCase(base.MuranoWithDBTestCase): fully_qualified_name=str(uuid.uuid4())), self.tenant_id_2) res = api.package_search({'owned': 'true'}, self.context_admin) - self.assertEqual(len(res), 1) + self.assertEqual(1, len(res)) res = api.package_search({'owned': 'false'}, self.context_admin) - self.assertEqual(len(res), 2) + self.assertEqual(2, len(res)) def test_package_search_no_filters_catalog(self): res = api.package_search({}, self.context, catalog=True) - self.assertEqual(len(res), 0) + self.assertEqual(0, len(res)) api.package_upload( self._stub_package( @@ -325,14 +325,14 @@ class CatalogDBTestCase(base.MuranoWithDBTestCase): # catalog=True should show public + mine res = api.package_search({}, self.context, catalog=True) - self.assertEqual(len(res), 3) + self.assertEqual(3, len(res)) res = api.package_search({}, self.context_admin, catalog=True) - self.assertEqual(len(res), 3) + self.assertEqual(3, len(res)) def test_package_search_no_filters(self): res = api.package_search({}, self.context) - self.assertEqual(len(res), 0) + self.assertEqual(0, len(res)) api.package_upload( self._stub_package( @@ -354,13 +354,13 @@ class CatalogDBTestCase(base.MuranoWithDBTestCase): # I can only edit mine pkgs res = api.package_search({}, self.context) - self.assertEqual(len(res), 2) + self.assertEqual(2, len(res)) for pkg in res: - self.assertEqual(pkg.owner_id, self.tenant_id) + self.assertEqual(self.tenant_id, pkg.owner_id) # Admin can see everything res = api.package_search({}, self.context_admin) - self.assertEqual(len(res), 4) + self.assertEqual(4, len(res)) def test_list_empty_categories(self): res = api.category_get_names() diff --git a/murano/tests/unit/dsl/test_contracts.py b/murano/tests/unit/dsl/test_contracts.py index ba4b3ed4..42c36be2 100644 --- a/murano/tests/unit/dsl/test_contracts.py +++ b/murano/tests/unit/dsl/test_contracts.py @@ -37,12 +37,12 @@ class TestContracts(test_case.DslTestCase): def test_string_contract(self): result = self._runner.testStringContract('qwerty') self.assertIsInstance(result, types.StringTypes) - self.assertEqual(result, 'qwerty') + self.assertEqual('qwerty', result) def test_string_from_number_contract(self): result = self._runner.testStringContract(123) self.assertIsInstance(result, types.StringTypes) - self.assertEqual(result, '123') + self.assertEqual('123', result) def test_string_null_contract(self): self.assertIsNone(self._runner.testStringContract(None)) @@ -50,12 +50,12 @@ class TestContracts(test_case.DslTestCase): def test_int_contract(self): result = self._runner.testIntContract(123) self.assertIsInstance(result, int) - self.assertEqual(result, 123) + self.assertEqual(123, result) def test_int_from_string_contract(self): result = self._runner.testIntContract('456') self.assertIsInstance(result, int) - self.assertEqual(result, 456) + self.assertEqual(456, result) def test_int_from_string_contract_failure(self): self.assertRaises(exceptions.ContractViolationException, @@ -102,7 +102,7 @@ class TestContracts(test_case.DslTestCase): def test_class_contract_by_ref(self): arg = om.Object('SampleClass2', class2Property='qwerty') result = self._runner.testClassContract(arg) - self.assertEqual(result.id, arg.id) + self.assertEqual(arg.id, result.id) def test_class_contract_failure(self): self.assertRaises( @@ -124,7 +124,7 @@ class TestContracts(test_case.DslTestCase): object_id = self._runner.root.get_property('sampleClass').object_id result = self._runner.testClassFromIdContract(object_id) self.assertIsInstance(result, dsl.MuranoObjectInterface) - self.assertEqual(result.id, object_id) + self.assertEqual(object_id, result.id) def test_check_contract(self): arg = om.Object('SampleClass2', class2Property='qwerty') diff --git a/murano/tests/unit/dsl/test_execution.py b/murano/tests/unit/dsl/test_execution.py index ff85718d..2a94c05d 100644 --- a/murano/tests/unit/dsl/test_execution.py +++ b/murano/tests/unit/dsl/test_execution.py @@ -36,13 +36,13 @@ class TestExecution(test_case.DslTestCase): def test_trace(self): runner = self._load() - self.assertEqual(self.traces, []) + self.assertEqual([], self.traces) runner.testTrace(123) - self.assertEqual(self.traces, [123, 'STRING', 'ANOTHER_STRING']) + self.assertEqual([123, 'STRING', 'ANOTHER_STRING'], self.traces) runner.testTrace(321) - self.assertEqual(self.traces, [ - 123, 'STRING', 'ANOTHER_STRING', - 321, 'STRING', 'ANOTHER_STRING']) + self.assertEqual([123, 'STRING', 'ANOTHER_STRING', + 321, 'STRING', 'ANOTHER_STRING'], + self.traces) def test_exception(self): class CustomException(Exception): diff --git a/murano/tests/unit/engine/system/test_agent.py b/murano/tests/unit/engine/system/test_agent.py index f03f6510..db41e4c8 100644 --- a/murano/tests/unit/engine/system/test_agent.py +++ b/murano/tests/unit/engine/system/test_agent.py @@ -62,21 +62,21 @@ class TestExecutionPlan(base.MuranoTestCase): self._read('application.template'), Loader=self.yaml_loader) template = self.agent.build_execution_plan(template, self.resources) - self.assertEqual(template, self._get_application()) + self.assertEqual(self._get_application(), template) def test_execution_plan_v2_chef_type(self): template = yamllib.load( self._read('chef.template'), Loader=self.yaml_loader) template = self.agent.build_execution_plan(template, self.resources) - self.assertEqual(template, self._get_chef()) + self.assertEqual(self._get_chef(), template) def test_execution_plan_v2_telnet_application(self): template = yamllib.load( self._read('DeployTelnet.template'), Loader=self.yaml_loader) template = self.agent.build_execution_plan(template, self.resources) - self.assertEqual(template, self._get_telnet_application()) + self.assertEqual(self._get_telnet_application(), template) def test_execution_plan_v2_tomcat_application(self): template = yamllib.load( @@ -89,14 +89,14 @@ class TestExecutionPlan(base.MuranoTestCase): self._read('application_without_files.template'), Loader=self.yaml_loader) template = self.agent.build_execution_plan(template, self.resources) - self.assertEqual(template, self._get_app_without_files()) + self.assertEqual(self._get_app_without_files(), template) def test_execution_plan_v2_app_with_file_in_template(self): template = yamllib.load( self._read('template_with_files.template'), Loader=self.yaml_loader) template = self.agent.build_execution_plan(template, self.resources) - self.assertEqual(template, self._get_app_with_files_in_template()) + self.assertEqual(self._get_app_with_files_in_template(), template) def _get_application(self): return { diff --git a/murano/tests/unit/packages/hot_package/test_hot_package.py b/murano/tests/unit/packages/hot_package/test_hot_package.py index dd880cbf..d8d76089 100644 --- a/murano/tests/unit/packages/hot_package/test_hot_package.py +++ b/murano/tests/unit/packages/hot_package/test_hot_package.py @@ -48,4 +48,4 @@ class TestHotPackage(test_base.MuranoTestCase): files = murano.packages.hot_package.HotPackage \ ._translate_files(package_dir) msg = "heat files were not generated correctly. Expected empty dict" - self.assertEqual(files, [], msg) + self.assertEqual([], files, msg) diff --git a/murano/tests/unit/packages/versions/test_hot_v1.py b/murano/tests/unit/packages/versions/test_hot_v1.py index 46e70401..f755fa22 100644 --- a/murano/tests/unit/packages/versions/test_hot_v1.py +++ b/murano/tests/unit/packages/versions/test_hot_v1.py @@ -28,19 +28,18 @@ class TestHotV1(test_base.MuranoTestCase): package = load_utils.load_from_dir(package_dir) self.assertNotEqual(package.supplier, None) - self.assertEqual(package.supplier['Name'], 'Supplier Name') - self.assertEqual(package.supplier['CompanyUrl'], { - 'Link': 'http://example.com', - 'Text': 'Example Company' - }) + self.assertEqual('Supplier Name', package.supplier['Name']) + self.assertEqual({'Link': 'http://example.com', + 'Text': 'Example Company'}, + package.supplier['CompanyUrl']) self.assertEqual( - package.supplier['Summary'], - 'Company summary goes here' + 'Company summary goes here', + package.supplier['Summary'] ) self.assertEqual( - package.supplier['Description'], - 'Marked up company description goes here' + 'Marked up company description goes here', + package.supplier['Description'] ) - self.assertEqual(package.supplier['Logo'], 'test_supplier_logo.png') + self.assertEqual('test_supplier_logo.png', package.supplier['Logo']) - self.assertEqual(imghdr.what('', package.supplier_logo), 'png') + self.assertEqual('png', imghdr.what('', package.supplier_logo)) diff --git a/murano/tests/unit/packages/versions/test_mpl_v1.py b/murano/tests/unit/packages/versions/test_mpl_v1.py index d0babfb3..57e55070 100644 --- a/murano/tests/unit/packages/versions/test_mpl_v1.py +++ b/murano/tests/unit/packages/versions/test_mpl_v1.py @@ -26,19 +26,18 @@ class TestMplV1(test_base.MuranoTestCase): package = load_utils.load_from_dir(package_dir) self.assertNotEqual(package.supplier, None) - self.assertEqual(package.supplier['Name'], 'Supplier Name') - self.assertEqual(package.supplier['CompanyUrl'], { - 'Link': 'http://example.com', - 'Text': 'Example Company' - }) + self.assertEqual('Supplier Name', package.supplier['Name']) + self.assertEqual({'Link': 'http://example.com', + 'Text': 'Example Company'}, + package.supplier['CompanyUrl']) self.assertEqual( - package.supplier['Summary'], - 'Company summary goes here' + 'Company summary goes here', + package.supplier['Summary'] ) self.assertEqual( - package.supplier['Description'], - 'Marked up company description goes here' + 'Marked up company description goes here', + package.supplier['Description'] ) - self.assertEqual(package.supplier['Logo'], 'test_supplier_logo.png') + self.assertEqual('test_supplier_logo.png', package.supplier['Logo']) - self.assertEqual(imghdr.what('', package.supplier_logo), 'png') + self.assertEqual('png', imghdr.what('', package.supplier_logo))