Convert unit tests to pytest

Author: nateprewitt

tests/unit/docs/__init__.py

@@ -290,11 +290,11 @@ def assert_contains_lines_in_order(self, lines, contents=None):
         if contents is None:
             contents = self.doc_structure.flush_structure().decode('utf-8')
         for line in lines:
-            self.assertIn(line, contents)
+            assert line in contents
             beginning = contents.find(line)
             contents = contents[(beginning + len(line)):]
 
     def assert_not_contains_lines(self, lines):
         contents = self.doc_structure.flush_structure().decode('utf-8')
         for line in lines:
-            self.assertNotIn(line, contents)
+            assert line not in contents

tests/unit/docs/test_service.py

@@ -98,7 +98,7 @@ def test_document_service_no_resource(self):
         os.remove(self.resource_model_file)
         service_documenter = ServiceDocumenter('myservice', self.session)
         contents = service_documenter.document_service().decode('utf-8')
-        self.assertNotIn('Service Resource', contents)
+        assert 'Service Resource' not in contents
 
     def test_document_service_no_paginators(self):
         # Delete the resource model so that the resource is not documented
@@ -107,7 +107,7 @@ def test_document_service_no_paginators(self):
         os.remove(self.paginator_model_file)
         service_documenter = ServiceDocumenter('myservice', self.session)
         contents = service_documenter.document_service().decode('utf-8')
-        self.assertNotIn('Paginators', contents)
+        assert 'Paginators' not in contents
 
     def test_document_service_no_waiter(self):
         # Delete the resource model so that the resource is not documented
@@ -116,7 +116,7 @@ def test_document_service_no_waiter(self):
         os.remove(self.waiter_model_file)
         service_documenter = ServiceDocumenter('myservice', self.session)
         contents = service_documenter.document_service().decode('utf-8')
-        self.assertNotIn('Waiters', contents)
+        assert 'Waiters' not in contents
 
     def test_creates_correct_path_to_examples_based_on_service_name(self):
         path = os.sep.join([os.path.dirname(boto3.__file__),
@@ -126,9 +126,7 @@ def test_creates_correct_path_to_examples_based_on_service_name(self):
             isfile.return_value = False
             s = ServiceDocumenter('myservice', self.session)
             s.document_service()
-            self.assertEqual(
-                isfile.call_args_list[-1],
-                mock.call(path))
+            assert isfile.call_args_list[-1] == mock.call(path)
 
     def test_injects_examples_when_found(self):
         examples_path = os.sep.join([os.path.dirname(__file__), '..', 'data',
@@ -137,5 +135,5 @@ def test_injects_examples_when_found(self):
             'myservice', self.session)
         service_documenter.EXAMPLE_PATH = examples_path
         contents = service_documenter.document_service().decode('utf-8')
-        self.assertIn('This is an example', contents)
-        self.assertNotIn('This is for another service', contents)
+        assert 'This is an example' in contents
+        assert 'This is for another service' not in contents

tests/unit/docs/test_utils.py

@@ -20,23 +20,23 @@ class TestGetResourceIgnoreParams(unittest.TestCase):
     def test_target_is_single_resource(self):
         param = Parameter('InstanceId', 'response')
         ignore_params = get_resource_ignore_params([param])
-        self.assertEqual(ignore_params, ['InstanceId'])
+        assert ignore_params == ['InstanceId']
 
     def test_target_is_multiple_resources(self):
         param = Parameter('InstanceIds[]', 'response')
         ignore_params = get_resource_ignore_params([param])
-        self.assertEqual(ignore_params, ['InstanceIds'])
+        assert ignore_params == ['InstanceIds']
 
     def test_target_is_element_of_multiple_resources(self):
         param = Parameter('InstanceIds[0]', 'response')
         ignore_params = get_resource_ignore_params([param])
-        self.assertEqual(ignore_params, ['InstanceIds'])
+        assert ignore_params == ['InstanceIds']
 
     def test_target_is_nested_param(self):
         param = Parameter('Filters[0].Name', 'response')
         ignore_params = get_resource_ignore_params([param])
-        self.assertEqual(ignore_params, ['Filters'])
+        assert ignore_params == ['Filters']
 
         param = Parameter('Filters[0].Values[0]', 'response')
         ignore_params = get_resource_ignore_params([param])
-        self.assertEqual(ignore_params, ['Filters'])
+        assert ignore_params == ['Filters']