correct tests breaking changes

Author: Nementon

openapi_python_client/__init__.py

@@ -3,10 +3,13 @@
 import shutil
 import subprocess
 import sys
+import urllib
 from enum import Enum
 from pathlib import Path
 from typing import Any, Dict, Optional, Sequence, Union, cast
 
+import httpcore
+import httpx
 from jinja2 import BaseLoader, ChoiceLoader, Environment, FileSystemLoader, PackageLoader
 
 from openapi_python_client import utils
@@ -297,6 +300,8 @@ def _get_document(*, url: Optional[str], path: Optional[Path]) -> Union[Dict[str
         result = resolver.resolve()
         if len(result.errors) > 0:
             return GeneratorError(header="; ".join(result.errors))
+    except (httpx.HTTPError, httpcore.NetworkError, urllib.error.URLError):
+        return GeneratorError(header="Could not get OpenAPI document from provided URL")
     except Exception:
         return GeneratorError(header="Invalid YAML from provided source")
 

openapi_python_client/resolver/schema_resolver.py

@@ -1,7 +1,7 @@
 import logging
 import urllib
 from pathlib import Path
-from typing import Any, Dict, Generator, List, Union
+from typing import Any, Dict, Generator, List, Union, cast
 
 import httpx
 
@@ -21,12 +21,20 @@ def __init__(self, url_or_path: Union[str, Path]):
         self._root_url: Union[str, None] = None
         self._root_url_scheme: Union[str, None] = None
 
-        if isinstance(url_or_path, Path):
+        if self._isapath(url_or_path):
+            url_or_path = cast(Path, url_or_path)
             self._root_path = url_or_path.absolute()
             self._root_path_dir = self._root_path.parent
         else:
+            url_or_path = cast(str, url_or_path)
             self._root_url = url_or_path
-            self._root_url_scheme = urllib.parse.urlparse(url_or_path).scheme
+            try:
+                self._root_url_scheme = urllib.parse.urlparse(url_or_path).scheme
+            except Exception:
+                raise urllib.error.URLError(f"Coult not parse URL > {url_or_path}")
+
+    def _isapath(self, url_or_path: Union[str, Path]) -> bool:
+        return isinstance(url_or_path, Path)
 
     def resolve(self, recursive: bool = True) -> ResolvedSchema:
         assert self._root_path or self._root_url
@@ -81,14 +89,14 @@ def _fetch_remote_reference(self, relative_path: str) -> SchemaData:
             raise RuntimeError("Bad object initilalization")
 
     def _fetch_remote_file_path(self, path: Path) -> SchemaData:
-        logging.info("Fetching remote ref file path > {0}".format(path))
+        logging.info(f"Fetching remote ref file path > {path}")
         return DataLoader.load(str(path), path.read_bytes())
 
     def _fetch_url_reference(self, url: str) -> SchemaData:
         if url.startswith("//", 0):
             url = "{0}:{1}".format(self._root_url_scheme, url)
 
-        logging.info("Fetching remote ref url > {0}".format(url))
+        logging.info(f"Fetching remote ref url > {url}")
         return DataLoader.load(url, httpx.get(url).content)
 
     def _lookup_schema_references(self, attr: Any) -> Generator[Reference, None, None]:

tests/test___init__.py

@@ -1,4 +1,5 @@
 import pathlib
+from urllib.parse import ParseResult
 
 import httpcore
 import jinja2
@@ -167,7 +168,7 @@ def test__get_document_url_and_path(self, mocker):
         loads.assert_not_called()
 
     def test__get_document_bad_url(self, mocker):
-        get = mocker.patch("httpx.get", side_effect=httpcore.NetworkError)
+        get = mocker.patch("httpx.get")
         Path = mocker.patch("openapi_python_client.Path")
         loads = mocker.patch("yaml.safe_load")
 
@@ -177,7 +178,7 @@ def test__get_document_bad_url(self, mocker):
         result = _get_document(url=url, path=None)
 
         assert result == GeneratorError(header="Could not get OpenAPI document from provided URL")
-        get.assert_called_once_with(url)
+        get.assert_not_called()
         Path.assert_not_called()
         loads.assert_not_called()
 
@@ -188,7 +189,7 @@ def test__get_document_url_no_path(self, mocker):
 
         from openapi_python_client import _get_document
 
-        url = mocker.MagicMock()
+        url = "http://localhost/"
         _get_document(url=url, path=None)
 
         get.assert_called_once_with(url)
@@ -198,28 +199,30 @@ def test__get_document_url_no_path(self, mocker):
     def test__get_document_path_no_url(self, mocker):
         get = mocker.patch("httpx.get")
         loads = mocker.patch("yaml.safe_load")
+        mocker.patch("openapi_python_client.resolver.schema_resolver.SchemaResolver._isapath", return_value=True)
 
         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())
+        path.absolute().read_bytes.assert_called_once()
+        loads.assert_called_once_with(path.absolute().read_bytes())
 
     def test__get_document_bad_yaml(self, mocker):
         get = mocker.patch("httpx.get")
         loads = mocker.patch("yaml.safe_load", side_effect=yaml.YAMLError)
+        mocker.patch("openapi_python_client.resolver.schema_resolver.SchemaResolver._isapath", return_value=True)
 
         from openapi_python_client import _get_document
 
         path = mocker.MagicMock()
         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())
+        path.absolute().read_bytes.assert_called_once()
+        loads.assert_called_once_with(path.absolute().read_bytes())
         assert result == GeneratorError(header="Invalid YAML from provided source")