Merge "Prefer assertEqual/assertIn over assertOutput/assertInOutput"

Author: Jenkins

functional/tests/common/test_quota.py

@@ -35,4 +35,4 @@ def test_quota_set(self):
     def test_quota_show(self):
         raw_output = self.openstack('quota show ' + self.PROJECT_NAME)
         for expected_field in self.EXPECTED_FIELDS:
-            self.assertInOutput(expected_field, raw_output)
+            self.assertIn(expected_field, raw_output)

functional/tests/identity/v2/test_endpoint.py

@@ -27,7 +27,7 @@ def test_endpoint_delete(self):
     def test_endpoint_list(self):
         endpoint_id = self._create_dummy_endpoint()
         raw_output = self.openstack('endpoint list')
-        self.assertInOutput(endpoint_id, raw_output)
+        self.assertIn(endpoint_id, raw_output)
         items = self.parse_listing(raw_output)
         self.assert_table_structure(items, self.ENDPOINT_LIST_HEADERS)
 

functional/tests/identity/v3/test_endpoint.py

@@ -31,7 +31,7 @@ def test_endpoint_delete(self):
     def test_endpoint_list(self):
         endpoint_id = self._create_dummy_endpoint()
         raw_output = self.openstack('endpoint list')
-        self.assertInOutput(endpoint_id, raw_output)
+        self.assertIn(endpoint_id, raw_output)
         items = self.parse_listing(raw_output)
         self.assert_table_structure(items, self.ENDPOINT_LIST_HEADERS)
 

functional/tests/identity/v3/test_group.py

@@ -25,15 +25,15 @@ def test_group_list(self):
         raw_output = self.openstack('group list')
         items = self.parse_listing(raw_output)
         self.assert_table_structure(items, test_identity.BASIC_LIST_HEADERS)
-        self.assertInOutput(group_name, raw_output)
+        self.assertIn(group_name, raw_output)
 
     def test_group_list_with_domain(self):
         group_name = self._create_dummy_group()
         raw_output = self.openstack(
             'group list --domain %s' % self.domain_name)
         items = self.parse_listing(raw_output)
         self.assert_table_structure(items, test_identity.BASIC_LIST_HEADERS)
-        self.assertInOutput(group_name, raw_output)
+        self.assertIn(group_name, raw_output)
 
     def test_group_delete(self):
         group_name = self._create_dummy_group(add_clean_up=False)
@@ -102,7 +102,7 @@ def test_group_add_user(self):
                                     'user_domain': self.domain_name,
                                     'group': group_name,
                                     'user': username})
-        self.assertOutput(
+        self.assertEqual(
             '%(user)s added to group %(group)s\n' % {'user': username,
                                                      'group': group_name},
             raw_output
@@ -128,7 +128,7 @@ def test_group_contains_user(self):
                                     'user_domain': self.domain_name,
                                     'group': group_name,
                                     'user': username})
-        self.assertOutput(
+        self.assertEqual(
             '%(user)s added to group %(group)s\n' % {'user': username,
                                                      'group': group_name},
             raw_output
@@ -141,7 +141,7 @@ def test_group_contains_user(self):
                                     'user_domain': self.domain_name,
                                     'group': group_name,
                                     'user': username})
-        self.assertOutput(
+        self.assertEqual(
             '%(user)s in group %(group)s\n' % {'user': username,
                                                'group': group_name},
             raw_output)
@@ -165,12 +165,12 @@ def test_group_remove_user(self):
                                     'user_domain': self.domain_name,
                                     'group': group_name,
                                     'user': username})
-        self.assertOutput(
+        self.assertEqual(
             '%(user)s added to group %(group)s\n' % {'user': username,
                                                      'group': group_name},
             add_raw_output
         )
-        self.assertOutput(
+        self.assertEqual(
             '%(user)s removed from '
             'group %(group)s\n' % {'user': username,
                                    'group': group_name},

functional/tests/identity/v3/test_project.py

@@ -65,7 +65,7 @@ def test_project_list_with_domain(self):
             'project list --domain %s' % self.domain_name)
         items = self.parse_listing(raw_output)
         self.assert_table_structure(items, test_identity.BASIC_LIST_HEADERS)
-        self.assertInOutput(project_name, raw_output)
+        self.assertIn(project_name, raw_output)
         self.assertTrue(len(items) > 0)
 
     def test_project_set(self):