refactor: update tests to set no_auth configuration and improve proxy handling

- Adjust test cases in `test_check.py` and `test_check_multi_account.py` to set `no_auth` to True, ensuring consistent behavior during proxy checks.
- Enhance proxy request assertions to include both HTTP and HTTPS protocols.
- Update GCP provider tests to mock `get_client` for better isolation and reliability in tests.
- Modify assertions in `test_gcp_start` to use `ANY` for more flexible verification of deployment calls.

Author: claffin

tests/test_check.py

@@ -114,16 +114,21 @@ def test_check_alive_success(mock_get):
     mock_response.status_code = 200
     mock_get.return_value = mock_response
 
-    # Execute
-    result = check_alive("10.0.0.1")
-    
-    # Verify
-    assert result is True
-    mock_get.assert_called_once_with(
-        "http://ipecho.net/plain", 
-        proxies={'http': "http://10.0.0.1:8899"}, 
-        timeout=10
-    )
+    # Set no_auth to True
+    original_no_auth = settings.config["no_auth"]
+    settings.config["no_auth"] = True
+    try:
+        # Execute
+        result = check_alive("10.0.0.1")
+        # Verify
+        assert result is True
+        mock_get.assert_called_once_with(
+            "http://ipecho.net/plain", 
+            proxies={'http': "http://10.0.0.1:8899", 'https': "http://10.0.0.1:8899"}, 
+            timeout=10
+        )
+    finally:
+        settings.config["no_auth"] = original_no_auth
 
 @patch('cloudproxy.check.requests.get')
 def test_check_alive_auth_required(mock_get):

tests/test_check_multi_account.py

@@ -72,24 +72,27 @@ def test_check_alive_for_different_instances(mock_requests_get, mock_proxy_data)
     mock_response.status_code = 200
     mock_requests_get.return_value = mock_response
 
-    # Test check_alive for each proxy
-    for proxy in mock_proxy_data:
-        # Call function under test
-        result = check_alive(proxy["ip"])
-        
-        # Verify result
-        assert result is True, f"check_alive for {proxy['ip']} from {proxy['provider']}/{proxy['instance']} should return True"
-        
-        # Verify correct proxy was used in the request
-        expected_proxy = {'http': f'http://{proxy["ip"]}:8899'}
-        mock_requests_get.assert_called_with(
-            "http://ipecho.net/plain", 
-            proxies=expected_proxy, 
-            timeout=10
-        )
-        
-        # Reset mock for next iteration
-        mock_requests_get.reset_mock()
+    # Set no_auth to True
+    original_no_auth = settings.config["no_auth"]
+    settings.config["no_auth"] = True
+    try:
+        # Test check_alive for each proxy
+        for proxy in mock_proxy_data:
+            # Call function under test
+            result = check_alive(proxy["ip"])
+            # Verify result
+            assert result is True, f"check_alive for {proxy['ip']} from {proxy['provider']}/{proxy['instance']} should return True"
+            # Verify correct proxy was used in the request
+            expected_proxy = {'http': f'http://{proxy["ip"]}:8899', 'https': f'http://{proxy["ip"]}:8899'}
+            mock_requests_get.assert_called_with(
+                "http://ipecho.net/plain", 
+                proxies=expected_proxy, 
+                timeout=10
+            )
+            # Reset mock for next iteration
+            mock_requests_get.reset_mock()
+    finally:
+        settings.config["no_auth"] = original_no_auth
 
 
 @patch('cloudproxy.check.requests_retry_session')

tests/test_providers_gcp_functions.py

@@ -36,8 +36,10 @@ def mock_gcp_environment():
 )
 from cloudproxy.providers.settings import config
 
+@patch('cloudproxy.providers.gcp.functions.get_client')
 @patch('uuid.uuid4')
-def test_create_proxy(mock_uuid, mock_gcp_environment):
+def test_create_proxy(mock_uuid, mock_get_client, mock_gcp_environment):
+    mock_get_client.return_value = (None, mock_gcp_environment)
     """Test create_proxy function"""
     # Setup
     mock_uuid.return_value = "test-uuid"
@@ -78,8 +80,9 @@ def test_create_proxy(mock_uuid, mock_gcp_environment):
     assert body["networkInterfaces"][0]["accessConfigs"][0]["type"] == "ONE_TO_ONE_NAT"
     assert "startup-script" in body["metadata"]["items"][0]["key"]
 
-def test_delete_proxy_success(mock_gcp_environment):
-    """Test delete_proxy function successful case"""
+@patch('cloudproxy.providers.gcp.functions.get_client')
+def test_delete_proxy_success(mock_get_client, mock_gcp_environment):
+    mock_get_client.return_value = (None, mock_gcp_environment)
     # Setup
     mock_compute = mock_gcp_environment
     name = "cloudproxy-123"
@@ -101,8 +104,9 @@ def test_delete_proxy_success(mock_gcp_environment):
     )
     assert result == {"status": "RUNNING"}
 
-def test_delete_proxy_http_error(mock_gcp_environment):
-    """Test delete_proxy function when HTTP error occurs"""
+@patch('cloudproxy.providers.gcp.functions.get_client')
+def test_delete_proxy_http_error(mock_get_client, mock_gcp_environment):
+    mock_get_client.return_value = (None, mock_gcp_environment)
     # Setup
     mock_compute = mock_gcp_environment
     name = "cloudproxy-123"
@@ -121,8 +125,9 @@ def test_delete_proxy_http_error(mock_gcp_environment):
     # Verify
     assert result is None
 
-def test_stop_proxy_success(mock_gcp_environment):
-    """Test stop_proxy function successful case"""
+@patch('cloudproxy.providers.gcp.functions.get_client')
+def test_stop_proxy_success(mock_get_client, mock_gcp_environment):
+    mock_get_client.return_value = (None, mock_gcp_environment)
     # Setup
     mock_compute = mock_gcp_environment
     name = "cloudproxy-123"
@@ -144,8 +149,9 @@ def test_stop_proxy_success(mock_gcp_environment):
     )
     assert result == {"status": "STOPPING"}
 
-def test_stop_proxy_http_error(mock_gcp_environment):
-    """Test stop_proxy function when HTTP error occurs"""
+@patch('cloudproxy.providers.gcp.functions.get_client')
+def test_stop_proxy_http_error(mock_get_client, mock_gcp_environment):
+    mock_get_client.return_value = (None, mock_gcp_environment)
     # Setup
     mock_compute = mock_gcp_environment
     name = "cloudproxy-123"
@@ -164,8 +170,9 @@ def test_stop_proxy_http_error(mock_gcp_environment):
     # Verify
     assert result is None
 
-def test_start_proxy_success(mock_gcp_environment):
-    """Test start_proxy function successful case"""
+@patch('cloudproxy.providers.gcp.functions.get_client')
+def test_start_proxy_success(mock_get_client, mock_gcp_environment):
+    mock_get_client.return_value = (None, mock_gcp_environment)
     # Setup
     mock_compute = mock_gcp_environment
     name = "cloudproxy-123"
@@ -187,8 +194,9 @@ def test_start_proxy_success(mock_gcp_environment):
     )
     assert result == {"status": "RUNNING"}
 
-def test_start_proxy_http_error(mock_gcp_environment):
-    """Test start_proxy function when HTTP error occurs"""
+@patch('cloudproxy.providers.gcp.functions.get_client')
+def test_start_proxy_http_error(mock_get_client, mock_gcp_environment):
+    mock_get_client.return_value = (None, mock_gcp_environment)
     # Setup
     mock_compute = mock_gcp_environment
     name = "cloudproxy-123"
@@ -207,8 +215,9 @@ def test_start_proxy_http_error(mock_gcp_environment):
     # Verify
     assert result is None
 
-def test_list_instances_with_instances(mock_gcp_environment):
-    """Test list_instances function when instances exist"""
+@patch('cloudproxy.providers.gcp.functions.get_client')
+def test_list_instances_with_instances(mock_get_client, mock_gcp_environment):
+    mock_get_client.return_value = (None, mock_gcp_environment)
     # Setup
     mock_compute = mock_gcp_environment
 
@@ -238,8 +247,9 @@ def test_list_instances_with_instances(mock_gcp_environment):
     assert len(result) == 1
     assert result[0]["name"] == "cloudproxy-123"
 
-def test_list_instances_no_instances(mock_gcp_environment):
-    """Test list_instances function when no instances exist"""
+@patch('cloudproxy.providers.gcp.functions.get_client')
+def test_list_instances_no_instances(mock_get_client, mock_gcp_environment):
+    mock_get_client.return_value = (None, mock_gcp_environment)
     # Setup
     mock_compute = mock_gcp_environment
 

tests/test_providers_gcp_main.py

@@ -1,5 +1,5 @@
 import pytest
-from unittest.mock import patch, Mock
+from unittest.mock import patch, Mock, ANY
 import datetime
 from datetime import timezone
 import itertools
@@ -336,7 +336,7 @@ def test_gcp_start(mock_gcp_deployment, mock_gcp_check_alive, mock_gcp_check_sto
         # Verify
         mock_gcp_check_delete.assert_called_once()
         mock_gcp_check_stop.assert_called_once()
-        mock_gcp_deployment.assert_called_once_with(3)
+        mock_gcp_deployment.assert_called_once_with(3, ANY)
         mock_gcp_check_alive.assert_called_once()
 
         assert result == ["1.2.3.4", "5.6.7.8"] # Should return IPs from check_alive