chore: Move tests to tests/ dir

.github/workflows/pull-request.yaml

@@ -22,25 +22,21 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
     - run: make deps
+    - run: make install
     - run: make test
+    # Run coverage on one of the builds, doesn't matter which
+    - if: ${{ matrix.python-version == '3.12' }}
+      run: make cov-xml
+    - if: ${{ matrix.python-version == '3.12' }}
+      uses: orgoro/[email protected]
+      with:
+          coverageFile: coverage.xml
+          thresholdAll: 0.8
+          token: ${{ secrets.GITHUB_TOKEN }}
   lint:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
     - uses: actions/setup-python@v5
     - run: make deps
     - run: make lint
-  cov:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-python@v5
-    - run: make deps
-    - run: make test
-    - run: make cov-xml
-    - if: always()
-      uses: orgoro/[email protected]
-      with:
-          coverageFile: coverage.xml
-          thresholdAll: 0.8
-          token: ${{ secrets.GITHUB_TOKEN }}

pyproject.toml

@@ -27,9 +27,8 @@ Source = "https://github.com/posit-dev/posit-sdk-py"
 Issues = "https://github.com/posit-dev/posit-sdk-py/issues"
 
 [tool.pytest.ini_options]
-python_files = [
-    "*_test.py",
-    "*_test_*.py",
+addopts = [
+    "--import-mode=importlib",
 ]
 
 [tool.setuptools_scm]

src/posit/connect/auth_test.py → tests/posit/connect/test_auth.py

@@ -1,6 +1,6 @@
 from unittest.mock import MagicMock, Mock, patch
 
-from .auth import Auth
+from posit.connect.auth import Auth
 
 
 class TestAuth:

src/posit/connect/client_test.py → tests/posit/connect/test_client.py

@@ -3,7 +3,7 @@
 
 from unittest.mock import MagicMock, patch
 
-from .client import Client
+from posit.connect import Client
 
 
 @pytest.fixture

src/posit/connect/config_test.py → tests/posit/connect/test_config.py

@@ -2,7 +2,7 @@
 
 from unittest.mock import patch
 
-from .config import Config, _get_api_key, _get_url
+from posit.connect.config import Config, _get_api_key, _get_url
 
 
 @patch.dict("os.environ", {"CONNECT_API_KEY": "foobar"})

src/posit/connect/content_test.py → tests/posit/connect/test_content.py

@@ -1,6 +1,6 @@
 import responses
 
-from .client import Client
+from posit.connect.client import Client
 
 
 class TestContents:

src/posit/connect/errors_test.py → tests/posit/connect/test_errors.py

@@ -1,6 +1,6 @@
 import pytest
 
-from .errors import ClientError
+from posit.connect.errors import ClientError
 
 
 class TestClientError:

tests/posit/connect/test_hooks.py

@@ -0,0 +1,65 @@
+import io
+
+import pytest
+
+from requests import HTTPError, Response
+from unittest.mock import Mock, patch
+
+from posit.connect.errors import ClientError
+from posit.connect.hooks import handle_errors
+
+
+def test_success():
+    response = Mock()
+    response.status_code = 200
+    assert handle_errors(response) == response
+
+
+def test_client_error():
+    response = Mock()
+    response.status_code = 400
+    response.json = Mock(return_value={"code": 0, "error": "foobar"})
+    with pytest.raises(ClientError):
+        handle_errors(response)
+
+
+@patch("posit.connect.hooks.JSONDecodeError")
+def test_client_error_without_payload(JSONDecodeError):
+    response = Mock()
+    response.status_code = 404
+    response.json = Mock(side_effect=JSONDecodeError())
+    response.raise_for_status = Mock(side_effect=Exception())
+    with pytest.raises(Exception):
+        handle_errors(response)
+
+
+def test_200():
+    response = Response()
+    response.status_code = 200
+    assert handle_errors(response) == response
+
+
+def test_response_client_error_with_plaintext_payload():
+    response = Response()
+    response.status_code = 404
+    response.raw = io.BytesIO(b"Plain text 404 Not Found")
+    with pytest.raises(HTTPError):
+        handle_errors(response)
+
+
+def test_response_client_error_with_json_payload():
+    response = Response()
+    response.status_code = 400
+    response.raw = io.BytesIO(b'{"code":0,"error":"foobar"}')
+    with pytest.raises(
+        ClientError, match=r"foobar \(Error Code: 0, HTTP Status: 400 Bad Request\)"
+    ):
+        handle_errors(response)
+
+
+def test_response_client_error_without_payload():
+    response = Response()
+    response.status_code = 404
+    response.raw = io.BytesIO(b"Plain text 404 Not Found")
+    with pytest.raises(HTTPError):
+        handle_errors(response)

src/posit/connect/oauth_test.py → tests/posit/connect/test_oauth.py

@@ -1,6 +1,6 @@
 import responses
 
-from .client import Client
+from posit.connect import Client
 
 
 class TestOAuthIntegrations:

src/posit/connect/urls_test.py → tests/posit/connect/test_urls.py

@@ -1,6 +1,6 @@
 import pytest
 
-from .urls import append_path, server_to_api_url, validate
+from posit.connect.urls import append_path, server_to_api_url, validate
 
 
 def test_append_path():

src/posit/connect/users_test.py → tests/posit/connect/test_users.py

@@ -1,7 +1,7 @@
 import pandas as pd
 import responses
 
-from .client import Client
+from posit.connect.client import Client
 
 
 class TestUsers: