test: Fix tests that were failing on Python 3.7

Author: dbanty

tests/test___init__.py

@@ -3,7 +3,6 @@
 import httpcore
 import jinja2
 import pytest
-import yaml
 
 from openapi_python_client import Config, ErrorLevel, GeneratorError, Project
 
@@ -148,7 +147,7 @@ def test_update_existing_client_project_error(mocker):
 class TestGetJson:
     def test__get_document_no_url_or_path(self, mocker):
         get = mocker.patch("httpx.get")
-        Path = mocker.patch("openapi_python_client.Path")
+        _Path = mocker.patch("openapi_python_client.Path")
         loads = mocker.patch("yaml.safe_load")
 
         from openapi_python_client import _get_document
@@ -157,12 +156,12 @@ def test__get_document_no_url_or_path(self, mocker):
 
         assert result == GeneratorError(header="No URL or Path provided")
         get.assert_not_called()
-        Path.assert_not_called()
+        _Path.assert_not_called()
         loads.assert_not_called()
 
     def test__get_document_url_and_path(self, mocker):
         get = mocker.patch("httpx.get")
-        Path = mocker.patch("openapi_python_client.Path")
+        _Path = mocker.patch("openapi_python_client.Path")
         loads = mocker.patch("yaml.safe_load")
 
         from openapi_python_client import _get_document
@@ -171,12 +170,12 @@ def test__get_document_url_and_path(self, mocker):
 
         assert result == GeneratorError(header="Provide URL or Path, not both.")
         get.assert_not_called()
-        Path.assert_not_called()
+        _Path.assert_not_called()
         loads.assert_not_called()
 
     def test__get_document_bad_url(self, mocker):
         get = mocker.patch("httpx.get", side_effect=httpcore.NetworkError)
-        Path = mocker.patch("openapi_python_client.Path")
+        _Path = mocker.patch("openapi_python_client.Path")
         loads = mocker.patch("yaml.safe_load")
 
         from openapi_python_client import _get_document
@@ -186,49 +185,47 @@ def test__get_document_bad_url(self, mocker):
 
         assert result == GeneratorError(header="Could not get OpenAPI document from provided URL")
         get.assert_called_once_with(url)
-        Path.assert_not_called()
+        _Path.assert_not_called()
         loads.assert_not_called()
 
     def test__get_document_url_no_path(self, mocker):
         get = mocker.patch("httpx.get")
-        Path = mocker.patch("openapi_python_client.Path")
+        _Path = mocker.patch("openapi_python_client.Path")
         loads = mocker.patch("yaml.safe_load")
 
         from openapi_python_client import _get_document
 
-        url = mocker.MagicMock()
+        url = "test"
         _get_document(url=url, path=None)
 
         get.assert_called_once_with(url)
-        Path.assert_not_called()
+        _Path.assert_not_called()
         loads.assert_called_once_with(get().content)
 
-    def test__get_document_path_no_url(self, mocker):
+    def test__get_document_path_no_url(self, tmp_path, mocker):
         get = mocker.patch("httpx.get")
         loads = mocker.patch("yaml.safe_load")
+        path = tmp_path / "test.yaml"
+        path.write_text("some test data")
 
         from openapi_python_client import _get_document
 
-        path = mocker.MagicMock()
         _get_document(url=None, path=path)
 
         get.assert_not_called()
-        path.read_bytes.assert_called_once()
-        loads.assert_called_once_with(path.read_bytes())
+        loads.assert_called_once_with(b"some test data")
 
-    def test__get_document_bad_yaml(self, mocker):
+    def test__get_document_bad_yaml(self, mocker, tmp_path):
         get = mocker.patch("httpx.get")
-        loads = mocker.patch("yaml.safe_load", side_effect=yaml.YAMLError("error line 2"))
-
         from openapi_python_client import _get_document
 
-        path = mocker.MagicMock()
+        path = tmp_path / "test.yaml"
+        path.write_text("'")
         result = _get_document(url=None, path=path)
 
         get.assert_not_called()
-        path.read_bytes.assert_called_once()
-        loads.assert_called_once_with(path.read_bytes())
-        assert result == GeneratorError(header="Invalid YAML from provided source: error line 2")
+        assert isinstance(result, GeneratorError)
+        assert "Invalid YAML" in result.header
 
     def test__get_document_json(self, mocker):
         class FakeResponse:
@@ -247,6 +244,7 @@ class FakeResponse:
 
         get.assert_called_once()
         json_loads.assert_called_once_with(FakeResponse.content.decode())
+        yaml_loads.assert_not_called()
         assert result == json_result
 
     def test__get_document_bad_json(self, mocker):
@@ -255,7 +253,6 @@ class FakeResponse:
             headers = {"content-type": "application/json; encoding=utf8"}
 
         get = mocker.patch("httpx.get", return_value=FakeResponse())
-        json_result = mocker.MagicMock()
 
         from openapi_python_client import _get_document
 

tests/test_config.py

@@ -1,42 +1,11 @@
 import json
-import pathlib
 
 import pytest
 import yaml
 
 from openapi_python_client.config import Config
 
 
-def test_load_from_path(mocker):
-    from openapi_python_client import utils
-
-    override1 = {"class_name": "ExampleClass", "module_name": "example_module"}
-    override2 = {"class_name": "DifferentClass", "module_name": "different_module"}
-    safe_load = mocker.patch(
-        "yaml.safe_load",
-        return_value={
-            "field_prefix": "blah",
-            "class_overrides": {"Class1": override1, "Class2": override2},
-            "project_name_override": "project-name",
-            "package_name_override": "package_name",
-            "package_version_override": "package_version",
-        },
-    )
-    fake_path = mocker.MagicMock(autospec=pathlib.Path)
-
-    config = Config.load_from_path(fake_path)
-    safe_load.assert_called()
-    assert config.field_prefix == "blah"
-    assert config.class_overrides["Class1"] == override1
-    assert config.class_overrides["Class2"] == override2
-    assert config.project_name_override == "project-name"
-    assert config.package_name_override == "package_name"
-    assert config.package_version_override == "package_version"
-
-
-DATA = {"class_overrides": {"Class1": {"class_name": "ExampleClass", "module_name": "example_module"}}}
-
-
 def json_with_tabs(d):
     return json.dumps(d, indent=4).replace("    ", "\t")
 
@@ -50,10 +19,23 @@ def json_with_tabs(d):
         ("example.json", json_with_tabs),
     ],
 )
-def test_load_filenames(tmp_path, filename, dump):
+def test_load_from_path(tmp_path, filename, dump):
     yml_file = tmp_path.joinpath(filename)
-    with open(yml_file, "w") as f:
-        f.write(dump(DATA))
+    override1 = {"class_name": "ExampleClass", "module_name": "example_module"}
+    override2 = {"class_name": "DifferentClass", "module_name": "different_module"}
+    data = {
+        "field_prefix": "blah",
+        "class_overrides": {"Class1": override1, "Class2": override2},
+        "project_name_override": "project-name",
+        "package_name_override": "package_name",
+        "package_version_override": "package_version",
+    }
+    yml_file.write_text(dump(data))
 
     config = Config.load_from_path(yml_file)
-    assert config.class_overrides == DATA["class_overrides"]
+    assert config.field_prefix == "blah"
+    assert config.class_overrides["Class1"] == override1
+    assert config.class_overrides["Class2"] == override2
+    assert config.project_name_override == "project-name"
+    assert config.package_name_override == "package_name"
+    assert config.package_version_override == "package_version"