Fix most unit tests.

Missing are everything using 'patch_ansible_module', which is likely something that has to be removed.

Author: felixfontein

tests/unit/plugins/modules/test_alerta_customer.py

@@ -82,169 +82,160 @@ def fetch_url_mock(self, mocker):
     def test_without_parameters(self):
         """Failure if no parameters set"""
         with self.assertRaises(AnsibleFailJson):
-            set_module_args({})
-            self.module.main()
+            with set_module_args({}):
+                self.module.main()
 
     def test_without_content(self):
         """Failure if customer and match are missing"""
-        set_module_args({
+        with set_module_args({
             'alerta_url': "http://localhost:8080",
             'api_username': "[email protected]",
             'api_password': "password"
-        })
-        with self.assertRaises(AnsibleFailJson):
-            self.module.main()
+        }):
+            with self.assertRaises(AnsibleFailJson):
+                self.module.main()
 
     def test_successful_existing_customer_creation(self):
         """Test the customer creation (already exists)."""
-        set_module_args({
+        with set_module_args({
             'alerta_url': "http://localhost:8080",
             'api_username': "[email protected]",
             'api_password': "password",
             'customer': 'Developer',
             'match': '[email protected]'
-        })
-
-        with patch.object(alerta_customer, "fetch_url") as fetch_url_mock:
-            fetch_url_mock.return_value = customer_response_page1()
-            with self.assertRaises(AnsibleExitJson):
-                self.module.main()
-            self.assertTrue(fetch_url_mock.call_count, 1)
+        }):
+            with patch.object(alerta_customer, "fetch_url") as fetch_url_mock:
+                fetch_url_mock.return_value = customer_response_page1()
+                with self.assertRaises(AnsibleExitJson):
+                    self.module.main()
+                self.assertTrue(fetch_url_mock.call_count, 1)
 
     def test_successful_customer_creation(self):
         """Test the customer creation."""
-        set_module_args({
+        with set_module_args({
             'alerta_url': "http://localhost:8080",
             'api_username': "[email protected]",
             'api_password': "password",
             'customer': 'Developer',
             'match': '[email protected]'
-        })
+        }):
+            with patch.object(alerta_customer, "fetch_url") as fetch_url_mock:
+                fetch_url_mock.return_value = customer_response_page1()
+                with self.assertRaises(AnsibleExitJson):
+                    self.module.main()
 
-        with patch.object(alerta_customer, "fetch_url") as fetch_url_mock:
-            fetch_url_mock.return_value = customer_response_page1()
-            with self.assertRaises(AnsibleExitJson):
-                self.module.main()
-
-            self.assertTrue(fetch_url_mock.call_count, 1)
-            call_data = json.loads(fetch_url_mock.call_args[1]['data'])
-            assert call_data['match'] == "[email protected]"
-            assert call_data['customer'] == "Developer"
+        self.assertTrue(fetch_url_mock.call_count, 1)
+        call_data = json.loads(fetch_url_mock.call_args[1]['data'])
+        assert call_data['match'] == "[email protected]"
+        assert call_data['customer'] == "Developer"
 
     def test_successful_customer_creation_key(self):
         """Test the customer creation using api_key."""
-        set_module_args({
+        with set_module_args({
             'alerta_url': "http://localhost:8080",
             'api_key': "demo-key",
             'customer': 'Developer',
             'match': '[email protected]'
-        })
-
-        with patch.object(alerta_customer, "fetch_url") as fetch_url_mock:
-            fetch_url_mock.return_value = customer_response_page1()
-            with self.assertRaises(AnsibleExitJson):
-                self.module.main()
+        }):
+            with patch.object(alerta_customer, "fetch_url") as fetch_url_mock:
+                fetch_url_mock.return_value = customer_response_page1()
+                with self.assertRaises(AnsibleExitJson):
+                    self.module.main()
 
-            self.assertTrue(fetch_url_mock.call_count, 1)
-            call_data = json.loads(fetch_url_mock.call_args[1]['data'])
-            assert call_data['match'] == "[email protected]"
-            assert call_data['customer'] == "Developer"
+        self.assertTrue(fetch_url_mock.call_count, 1)
+        call_data = json.loads(fetch_url_mock.call_args[1]['data'])
+        assert call_data['match'] == "[email protected]"
+        assert call_data['customer'] == "Developer"
 
     def test_failed_not_found(self):
         """Test failure with wrong URL."""
 
-        set_module_args({
+        with set_module_args({
             'alerta_url': "http://localhost:8080/s",
             'api_username': "[email protected]",
             'api_password': "password",
             'customer': 'Developer',
             'match': '[email protected]'
-        })
-
-        with patch.object(alerta_customer, "fetch_url") as fetch_url_mock:
-            fetch_url_mock.return_value = (None, {"status": 404, 'msg': 'Not found for request GET on http://localhost:8080/a/api/customers'})
-            with self.assertRaises(AnsibleFailJson):
-                self.module.main()
+        }):
+            with patch.object(alerta_customer, "fetch_url") as fetch_url_mock:
+                fetch_url_mock.return_value = (None, {"status": 404, 'msg': 'Not found for request GET on http://localhost:8080/a/api/customers'})
+                with self.assertRaises(AnsibleFailJson):
+                    self.module.main()
 
     def test_failed_forbidden(self):
         """Test failure with wrong user."""
 
-        set_module_args({
+        with set_module_args({
             'alerta_url': "http://localhost:8080",
             'api_username': "[email protected]",
             'api_password': "password",
             'customer': 'Developer',
             'match': '[email protected]'
-        })
-
-        with patch.object(alerta_customer, "fetch_url") as fetch_url_mock:
-            fetch_url_mock.return_value = (None, {"status": 403, 'msg': 'Permission Denied for GET on http://localhost:8080/api/customers'})
-            with self.assertRaises(AnsibleFailJson):
-                self.module.main()
+        }):
+            with patch.object(alerta_customer, "fetch_url") as fetch_url_mock:
+                fetch_url_mock.return_value = (None, {"status": 403, 'msg': 'Permission Denied for GET on http://localhost:8080/api/customers'})
+                with self.assertRaises(AnsibleFailJson):
+                    self.module.main()
 
     def test_failed_unauthorized(self):
         """Test failure with wrong username or password."""
 
-        set_module_args({
+        with set_module_args({
             'alerta_url': "http://localhost:8080",
             'api_username': "[email protected]",
             'api_password': "password_wrong",
             'customer': 'Developer',
             'match': '[email protected]'
-        })
-
-        with patch.object(alerta_customer, "fetch_url") as fetch_url_mock:
-            fetch_url_mock.return_value = (None, {"status": 401, 'msg': 'Unauthorized to request GET on http://localhost:8080/api/customers'})
-            with self.assertRaises(AnsibleFailJson):
-                self.module.main()
+        }):
+            with patch.object(alerta_customer, "fetch_url") as fetch_url_mock:
+                fetch_url_mock.return_value = (None, {"status": 401, 'msg': 'Unauthorized to request GET on http://localhost:8080/api/customers'})
+                with self.assertRaises(AnsibleFailJson):
+                    self.module.main()
 
     def test_successful_customer_deletion(self):
         """Test the customer deletion."""
 
-        set_module_args({
+        with set_module_args({
             'alerta_url': "http://localhost:8080",
             'api_username': "[email protected]",
             'api_password': "password",
             'customer': 'Developer',
             'match': '[email protected]',
             'state': 'absent'
-        })
-
-        with patch.object(alerta_customer, "fetch_url") as fetch_url_mock:
-            fetch_url_mock.return_value = customer_response_page1()
-            with self.assertRaises(AnsibleExitJson):
-                self.module.main()
+        }):
+            with patch.object(alerta_customer, "fetch_url") as fetch_url_mock:
+                fetch_url_mock.return_value = customer_response_page1()
+                with self.assertRaises(AnsibleExitJson):
+                    self.module.main()
 
     def test_successful_customer_deletion_page2(self):
         """Test the customer deletion on the second page."""
 
-        set_module_args({
+        with set_module_args({
             'alerta_url': "http://localhost:8080",
             'api_username': "[email protected]",
             'api_password': "password",
             'customer': 'Developer',
             'match': '[email protected]',
             'state': 'absent'
-        })
-
-        with patch.object(alerta_customer, "fetch_url") as fetch_url_mock:
-            fetch_url_mock.return_value = customer_response_page2()
-            with self.assertRaises(AnsibleExitJson):
-                self.module.main()
+        }):
+            with patch.object(alerta_customer, "fetch_url") as fetch_url_mock:
+                fetch_url_mock.return_value = customer_response_page2()
+                with self.assertRaises(AnsibleExitJson):
+                    self.module.main()
 
     def test_successful_nonexisting_customer_deletion(self):
         """Test the customer deletion (non existing)."""
 
-        set_module_args({
+        with set_module_args({
             'alerta_url': "http://localhost:8080",
             'api_username': "[email protected]",
             'api_password': "password",
             'customer': 'Billing',
             'match': '[email protected]',
             'state': 'absent'
-        })
-
-        with patch.object(alerta_customer, "fetch_url") as fetch_url_mock:
-            fetch_url_mock.return_value = customer_response_page1()
-            with self.assertRaises(AnsibleExitJson):
-                self.module.main()
+        }):
+            with patch.object(alerta_customer, "fetch_url") as fetch_url_mock:
+                fetch_url_mock.return_value = customer_response_page1()
+                with self.assertRaises(AnsibleExitJson):
+                    self.module.main()

tests/unit/plugins/modules/test_archive.py

@@ -25,27 +25,26 @@ def tearDown(self):
         self.os_path_isdir = self.mock_os_path_isdir.stop()
 
     def test_archive_removal_safety(self):
-        set_module_args(
+        with set_module_args(
             dict(
                 path=['/foo', '/bar', '/baz'],
                 dest='/foo/destination.tgz',
                 remove=True
             )
-        )
-
-        module = AnsibleModule(
-            argument_spec=dict(
-                path=dict(type='list', elements='path', required=True),
-                format=dict(type='str', default='gz', choices=['bz2', 'gz', 'tar', 'xz', 'zip']),
-                dest=dict(type='path'),
-                exclude_path=dict(type='list', elements='path', default=[]),
-                exclusion_patterns=dict(type='list', elements='path'),
-                force_archive=dict(type='bool', default=False),
-                remove=dict(type='bool', default=False),
-            ),
-            add_file_common_args=True,
-            supports_check_mode=True,
-        )
+        ):
+            module = AnsibleModule(
+                argument_spec=dict(
+                    path=dict(type='list', elements='path', required=True),
+                    format=dict(type='str', default='gz', choices=['bz2', 'gz', 'tar', 'xz', 'zip']),
+                    dest=dict(type='path'),
+                    exclude_path=dict(type='list', elements='path', default=[]),
+                    exclusion_patterns=dict(type='list', elements='path'),
+                    force_archive=dict(type='bool', default=False),
+                    remove=dict(type='bool', default=False),
+                ),
+                add_file_common_args=True,
+                supports_check_mode=True,
+            )
 
         self.os_path_isdir.side_effect = [True, False, False, True]