Disable pylint checks for some unit tests, update unit tests

Author: jcornall

tests/lib/apis/openstack_query_api/test_server_queries.py

@@ -17,8 +17,8 @@ def test_list_to_regex_pattern():
     assert res == "(.*img1|.*img2|.*img3)"
 
 
-@patch("workflows.send_decom_image_email.ImageQuery")
-@patch("workflows.send_decom_image_email.list_to_regex_pattern")
+@patch("apis.openstack_query_api.server_queries.ImageQuery")
+@patch("apis.openstack_query_api.server_queries.list_to_regex_pattern")
 def test_find_servers_with_image_valid(mock_list_to_regex, mock_image_query):
     """
     Tests find_servers_with_images() function
@@ -49,7 +49,7 @@ def test_find_servers_with_image_valid(mock_list_to_regex, mock_image_query):
     )
     mock_image_query_obj.to_props.assert_called_once()
     mock_image_query_obj.then.assert_called_once_with(
-        "server_query", keep_previous_results=True
+        "SERVER_QUERY", keep_previous_results=True
     )
 
     mock_server_query_obj.run.assert_called_once_with(
@@ -68,8 +68,8 @@ def test_find_servers_with_image_valid(mock_list_to_regex, mock_image_query):
     assert res == mock_server_query_obj
 
 
-@patch("workflows.send_decom_image_email.ImageQuery")
-@patch("workflows.send_decom_image_email.list_to_regex_pattern")
+@patch("apis.openstack_query_api.server_queries.ImageQuery")
+@patch("apis.openstack_query_api.server_queries.list_to_regex_pattern")
 def test_find_servers_with_image_invalid_images(mock_list_to_regex, mock_image_query):
     """
     Tests that find_servers_with_images() raises an error when supplied with an invalid image name
@@ -100,8 +100,8 @@ def test_find_servers_with_image_invalid_images(mock_list_to_regex, mock_image_q
     mock_image_query_obj.to_props.assert_called_once()
 
 
-@patch("workflows.send_decom_image_email.ImageQuery")
-@patch("workflows.send_decom_image_email.list_to_regex_pattern")
+@patch("apis.openstack_query_api.server_queries.ImageQuery")
+@patch("apis.openstack_query_api.server_queries.list_to_regex_pattern")
 def test_find_servers_with_image_no_servers_found(mock_list_to_regex, mock_image_query):
     """
     Tests that find_servers_with_images() raises an error when no servers are found

tests/lib/workflows/test_send_decom_image_email.py

@@ -149,6 +149,7 @@ def test_build_params(mock_email_params, mock_email_template_details):
 
 
 # pylint:disable=too-many-arguments
+# pylint:disable=too-many-locals
 @patch("workflows.send_decom_image_email.get_image_info")
 @patch("workflows.send_decom_image_email.find_servers_with_image")
 @patch("workflows.send_decom_image_email.find_user_info")
@@ -256,6 +257,7 @@ def test_send_decom_image_email_send_plaintext(
 
 
 # pylint:disable=too-many-arguments
+# pylint:disable=too-many-locals
 @patch("workflows.send_decom_image_email.get_image_info")
 @patch("workflows.send_decom_image_email.find_servers_with_image")
 @patch("workflows.send_decom_image_email.find_user_info")
@@ -465,6 +467,8 @@ def test_send_decom_image_email_print(
     )
 
 
+# pylint:disable=too-many-arguments
+# pylint:disable=too-many-locals
 @patch("workflows.send_decom_image_email.get_image_info")
 @patch("workflows.send_decom_image_email.find_servers_with_image")
 @patch("workflows.send_decom_image_email.find_user_info")