From a230b6f1b3e0c19e7f43b55a8183185a22c6e19f Mon Sep 17 00:00:00 2001 From: Andrew Ni Date: Thu, 22 Aug 2019 12:06:07 -0700 Subject: [PATCH 1/2] Fix role_tests.py system test Signed-off-by: Andrew Ni --- system_tests/role_tests.py | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/system_tests/role_tests.py b/system_tests/role_tests.py index aade14ed..a9983a02 100644 --- a/system_tests/role_tests.py +++ b/system_tests/role_tests.py @@ -1,6 +1,7 @@ from click.testing import CliRunner from pyvcloud.system_test_framework.base_test import BaseTestCase +from pyvcloud.system_test_framework.environment import CommonRoles from pyvcloud.system_test_framework.environment import Environment from vcd_cli.login import login, logout from vcd_cli.role import role @@ -14,36 +15,43 @@ class TestRole(BaseTestCase): def test_0000_setup(self): self._config = Environment.get_config() - TestRole._logger = Environment.get_default_logger() - TestRole._runner = CliRunner() - self._sys_login() + self._logger = Environment.get_default_logger() + self._runner = CliRunner() + self._org_admin_login() - def _sys_login(self): - """Logs in using admin credentials""" + def _org_admin_login(self): + """Logs in using org admin credentials""" login_args = [ self._config['vcd']['host'], - self._config['vcd']['sys_org_name'], - self._config['vcd']['sys_admin_username'], + self._config['vcd']['default_org_name'], + Environment.get_username_for_role_in_test_org(CommonRoles.ORGANIZATION_ADMINISTRATOR), # noqa: E501 "-i", "-w", - f"--password={self._config['vcd']['sys_admin_pass']}" + f"--password={self._config['vcd']['default_org_user_password']}" ] - result = TestRole._runner.invoke(login, args=login_args) + result = self._runner.invoke(login, args=login_args) self.assertEqual(0, result.exit_code) self.assertTrue("logged in" in result.output) - """def test_0010_role_clone(self): + def test_0010_role_clone(self): # org admin and sys admin can clone roles result = self._runner.invoke( role, args=['clone', ORG_ADMIN_ROLE_NAME, DUMMY_ROLE_NAME]) - TestRole._logger.debug(f"vcd role clone {ORG_ADMIN_ROLE_NAME} " - f"{DUMMY_ROLE_NAME}: {result.output}") - self.assertEqual(0, result.exit_code)""" + self._logger.debug(f"vcd role clone {ORG_ADMIN_ROLE_NAME} " + f"{DUMMY_ROLE_NAME}: {result.output}") + self.assertEqual(0, result.exit_code) def _logout(self): """Logs out current session, ignoring errors""" - TestRole._runner.invoke(logout) + self._runner.invoke(logout) def test_9999_teardown(self): + """Delete any created roles""" + result = self._runner.invoke( + role, + args=['delete', DUMMY_ROLE_NAME, '--yes']) + self._logger.debug(f"vcd role delete -y {DUMMY_ROLE_NAME}: " + f"{result.output}") + self.assertEqual(0, result.exit_code) self._logout() From 54892eb28fbb92f979cd1cbdb253d167dbc516e0 Mon Sep 17 00:00:00 2001 From: Andrew Ni Date: Fri, 23 Aug 2019 11:22:27 -0700 Subject: [PATCH 2/2] Fix flake8 Signed-off-by: Andrew Ni --- system_tests/role_tests.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/system_tests/role_tests.py b/system_tests/role_tests.py index a9983a02..3179daf3 100644 --- a/system_tests/role_tests.py +++ b/system_tests/role_tests.py @@ -24,7 +24,8 @@ def _org_admin_login(self): login_args = [ self._config['vcd']['host'], self._config['vcd']['default_org_name'], - Environment.get_username_for_role_in_test_org(CommonRoles.ORGANIZATION_ADMINISTRATOR), # noqa: E501 + Environment.get_username_for_role_in_test_org( + CommonRoles.ORGANIZATION_ADMINISTRATOR), "-i", "-w", f"--password={self._config['vcd']['default_org_user_password']}"