Merge "tests: Remove prints"

Author: Zuul

openstackclient/tests/unit/identity/v3/test_trust.py

@@ -294,7 +294,6 @@ def test_trust_list_trustee(self):
         # containing the data to be listed.
         columns, data = self.cmd.take_action(parsed_args)
 
-        print(self.trusts_mock.list.call_args_list)
         self.trusts_mock.list.assert_any_call(
             trustee_user=self.users_mock.get(),
             trustor_user=None,
@@ -335,7 +334,6 @@ def test_trust_list_trustor(self):
         # containing the data to be listed.
         columns, data = self.cmd.take_action(parsed_args)
 
-        print(self.trusts_mock.list.call_args_list)
         self.trusts_mock.list.assert_any_call(
             trustor_user=self.users_mock.get(),
             trustee_user=None,

openstackclient/tests/unit/integ/cli/test_shell.py

@@ -502,7 +502,6 @@ def vendor_mock_return():
         )
 
         # +env, -cli, +occ
-        print("auth_req: %s" % auth_req['auth'])
         self.assertEqual(
             test_shell.DEFAULT_USERNAME,
             auth_req['auth']['identity']['password']['user']['name'],
@@ -559,7 +558,6 @@ def vendor_mock_return():
         )
 
         # +env, +cli, +occ
-        print("auth_req: %s" % auth_req['auth'])
         self.assertEqual(
             'zarquon',
             auth_req['auth']['identity']['password']['user']['name'],

openstackclient/tests/unit/test_shell.py

@@ -141,10 +141,6 @@ class TestShell(osc_lib_test_utils.TestShell):
     # Full name of the OpenStackShell class to test (cliff.app.App subclass)
     shell_class_name = "openstackclient.shell.OpenStackShell"
 
-    # TODO(dtroyer): remove this once the shell_class_patch patch is released
-    #                in osc-lib
-    app_patch = shell_class_name
-
     def setUp(self):
         super(TestShell, self).setUp()
         # TODO(dtroyer): remove this once the shell_class_patch patch is
@@ -162,7 +158,6 @@ def _assert_admin_token_auth(self, cmd_options, default_args):
             )
             _cmd = cmd_options + " list role"
             osc_lib_test_utils.fake_execute(_shell, _cmd)
-            print("_shell: %s" % _shell)
 
             self.app.assert_called_with(["list", "role"])
             self.assertEqual(
@@ -178,15 +173,14 @@ def _assert_admin_token_auth(self, cmd_options, default_args):
 
     def _assert_token_auth(self, cmd_options, default_args):
         with mock.patch(
-            self.app_patch + ".initialize_app",
+            self.shell_class_name + ".initialize_app",
             self.app,
         ):
             _shell = osc_lib_test_utils.make_shell(
                 shell_class=self.shell_class,
             )
             _cmd = cmd_options + " list role"
             osc_lib_test_utils.fake_execute(_shell, _cmd)
-            print("_shell: %s" % _shell)
 
             self.app.assert_called_with(["list", "role"])
             self.assertEqual(