fix some tests

Author: rmorshea

setup.cfg

@@ -30,7 +30,7 @@ show_missing = True
 skip_covered = True
 sort = Name
 exclude_lines =
-    coverage: skip
+    pragma: no cover
     \.\.\.
     raise NotImplementedError
 omit =

src/idom/__init__.py

@@ -3,7 +3,7 @@
 
 try:
     __version__: str = _get_distribution(__name__).version
-except _DistributionNotFound:  # coverage: skip
+except _DistributionNotFound:  # pragma: no cover
     # package is not installed
     __version__ = "0.0.0"
 
@@ -24,7 +24,7 @@
     import htm
     import pyalect
     import tagged
-except ImportError:  # coverage: skip
+except ImportError:  # pragma: no cover
     pass
 else:
     from . import dialect

src/idom/_option.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import os
-from typing import Any, Callable, Generic, TypeVar
+from typing import Any, Callable, Generic, TypeVar, cast
 
 _O = TypeVar("_O")
 
@@ -14,7 +14,7 @@ def __init__(
         name: str,
         default: _O,
         allow_changes: bool = True,
-        validator: Callable[[Any], _O] = lambda x: x,
+        validator: Callable[[Any], _O] = lambda x: cast(_O, x),
     ) -> None:
         self.name = name
         self._default = default

src/idom/client/_private.py

@@ -12,7 +12,7 @@
 BACKUP_BUILD_DIR = APP_DIR / "build"
 
 
-if not IDOM_CLIENT_BUILD_DIR.get().exists():
+if not IDOM_CLIENT_BUILD_DIR.get().exists():  # pragma: no cover
     shutil.copytree(BACKUP_BUILD_DIR, IDOM_CLIENT_BUILD_DIR.get(), symlinks=True)
 
 

src/idom/client/manage.py

@@ -111,7 +111,7 @@ def build(packages_to_install: Sequence[str], clean_build: bool = False) -> None
 
     not_discovered = package_names_to_install.difference(web_module_names())
     if not_discovered:
-        raise RuntimeError(  # coverage: skip
+        raise RuntimeError(  # pragma: no cover
             f"Successfuly installed {list(package_names_to_install)} but "
             f"failed to discover {list(not_discovered)} post-install."
         )
@@ -129,7 +129,7 @@ def _run_subprocess(args: List[str], cwd: Path) -> None:
     cmd, *args = args
     which_cmd = shutil.which(cmd)
     if which_cmd is None:
-        raise RuntimeError(  # coverage: skip
+        raise RuntimeError(  # pragma: no cover
             f"Failed to run command - {cmd!r} is not installed."
         )
     try:
@@ -140,7 +140,7 @@ def _run_subprocess(args: List[str], cwd: Path) -> None:
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
         )
-    except subprocess.CalledProcessError as error:  # coverage: skip
+    except subprocess.CalledProcessError as error:  # pragma: no cover
         raise subprocess.SubprocessError(error.stderr.decode()) from error
     return None
 

src/idom/config.py

@@ -20,6 +20,6 @@
 IDOM_CLIENT_WEB_MODULE_BASE_URL = _option.Option(
     "IDOM_CLIENT_WEB_MODULE_BASE_URL",
     default=".",
-    validator=lambda x: x.rstrip("/"),
+    validator=lambda x: str(x).rstrip("/"),
 )
 """The base URL where all user-installed web modules reside"""

src/idom/core/component.py

@@ -3,7 +3,7 @@
 from functools import wraps
 from typing import TYPE_CHECKING, Any, Callable, Dict, Tuple, Union
 
-if TYPE_CHECKING:  # coverage: skip
+if TYPE_CHECKING:  # pragma: no cover
     from .vdom import VdomDict  # noqa
 
 

src/idom/core/events.py

@@ -134,7 +134,7 @@ def __iter__(self) -> Iterator[str]:
     def __getitem__(self, key: str) -> "EventHandler":
         return self._handlers[key]
 
-    def __repr__(self) -> str:  # coverage: skip
+    def __repr__(self) -> str:  # pragma: no cover
         return repr(self._handlers)
 
 
@@ -229,5 +229,5 @@ def __contains__(self, function: Any) -> bool:
         else:
             return function in self._func_handlers
 
-    def __repr__(self) -> str:  # coverage: skip
+    def __repr__(self) -> str:  # pragma: no cover
         return f"{type(self).__name__}({self.serialize()})"

src/idom/core/layout.py

@@ -67,7 +67,7 @@ class Layout(HasAsyncResources):
 
     __slots__ = ["root", "_event_handlers"]
 
-    if not hasattr(abc.ABC, "__weakref__"):  # coverage: skip
+    if not hasattr(abc.ABC, "__weakref__"):  # pragma: no cover
         __slots__.append("__weakref__")
 
     def __init__(self, root: "AbstractComponent") -> None:

src/idom/core/utils.py

@@ -14,9 +14,9 @@
     overload,
 )
 
-if sys.version_info >= (3, 7):  # coverage: skip
+if sys.version_info >= (3, 7):  # pragma: no cover
     from contextlib import AsyncExitStack, asynccontextmanager  # noqa
-else:  # coverage: skip
+else:  # pragma: no cover
     from async_exit_stack import AsyncExitStack
     from async_generator import asynccontextmanager
 

src/idom/server/base.py

@@ -44,9 +44,9 @@ def run(self, host: str, port: int, *args: Any, **kwargs: Any) -> None:
         if self._app is None:
             app = self._default_application(self._config)
             self.register(app)
-        else:  # coverage: skip
+        else:  # pragma: no cover
             app = self._app
-        if not self._daemonized:  # coverage: skip
+        if not self._daemonized:  # pragma: no cover
             return self._run_application(self._config, app, host, port, args, kwargs)
         else:
             return self._run_application_in_thread(
@@ -76,7 +76,7 @@ def register(self: _Self, app: Optional[_App]) -> _Self:
     def wait_until_server_start(self, timeout: float = 3.0) -> None:
         """Block until the underlying application has started"""
         if not self._server_did_start.wait(timeout=timeout):
-            raise RuntimeError(  # coverage: skip
+            raise RuntimeError(  # pragma: no cover
                 f"Server did not start within {timeout} seconds"
             )
 

src/idom/server/flask.py

@@ -45,7 +45,7 @@ class FlaskRenderServer(AbstractRenderServer[Flask, Config]):
     def stop(self, timeout: Optional[float] = None) -> None:
         try:
             server = self._wsgi_server
-        except AttributeError:  # coverage: skip
+        except AttributeError:  # pragma: no cover
             raise RuntimeError(
                 f"Application is not running or was not started by {self}"
             )
@@ -72,7 +72,7 @@ def _setup_application(self, config: Config, app: Flask) -> None:
         self._setup_blueprint_routes(config, bp)
 
         cors_config = config["cors"]
-        if cors_config:  # coverage: skip
+        if cors_config:  # pragma: no cover
             cors_params = cors_config if isinstance(cors_config, dict) else {}
             CORS(bp, **cors_params)
 
@@ -164,7 +164,7 @@ def _generic_run_application(
         **kwargs: Any,
     ) -> None:
         if debug:
-            logging.basicConfig(level=logging.DEBUG)  # coverage: skip
+            logging.basicConfig(level=logging.DEBUG)  # pragma: no cover
         logger.info(f"Running at http://{host}:{port}")
         self._wsgi_server = _StartCallbackWSGIServer(
             self._server_did_start.set,
@@ -274,7 +274,7 @@ def update_environ(self) -> None:
         """
         super().update_environ()
         # BUG: for some reason coverage doesn't seem to think this line is covered
-        self._before_first_request_callback()  # coverage: skip
+        self._before_first_request_callback()  # pragma: no cover
 
 
 def _join_url_paths(*args: str) -> str:

src/idom/server/prefab.py

@@ -46,14 +46,16 @@ def run(
         The server instance. This isn't really useful unless the server is spawned
         as a daemon. Otherwise this function blocks until the server has stopped.
     """
-    if port is None:  # coverage: skip
+    if server_type is None:  # pragma: no cover
+        raise ValueError("No default server available.")
+    if port is None:  # pragma: no cover
         port = find_available_port(host)
 
     logger.info(f"Using {server_type.__module__}.{server_type.__name__}")
 
     server = server_type(component, server_config)
 
-    if app is not None:  # coverage: skip
+    if app is not None:  # pragma: no cover
         server.register(app)
 
     run_server = server.run if not daemon else server.daemon

src/idom/server/sanic.py

@@ -195,7 +195,7 @@ async def _activate_dispatcher(
 
     async def _deactivate_dispatcher(
         self, app: Sanic, loop: asyncio.AbstractEventLoop
-    ) -> None:  # coverage: skip
+    ) -> None:  # pragma: no cover
         # this doesn't seem to get triggered during testing for some reason
         await self._dispatcher.stop()
 

src/idom/server/tornado.py

@@ -36,7 +36,7 @@ class TornadoRenderServer(AbstractRenderServer[Application, Config]):
     def stop(self) -> None:
         try:
             loop = self._loop
-        except AttributeError:  # coverage: skip
+        except AttributeError:  # pragma: no cover
             raise RuntimeError(
                 f"Application is not running or was not started by {self}"
             )

src/idom/server/utils.py

@@ -12,16 +12,16 @@ def find_builtin_server_type(type_name: str) -> Type[Any]:
     for name in supported_packages:
         try:
             import_module(name)
-        except ImportError:  # coverage: skip
+        except ImportError:  # pragma: no cover
             continue
         else:
             builtin_module = import_module(f"idom.server.{name}")
             installed_builtins.append(builtin_module.__name__)
         try:
             return getattr(builtin_module, type_name)  # type: ignore
-        except AttributeError:  # coverage: skip
+        except AttributeError:  # pragma: no cover
             pass
-    else:  # coverage: skip
+    else:  # pragma: no cover
         if not installed_builtins:
             raise RuntimeError(
                 f"Found none of the following builtin server implementations {supported_packages}"

src/idom/testing.py

@@ -105,7 +105,7 @@ def assert_logged_exception(
                     error = record.exc_info[1]
                     if isinstance(error, error_type) and re_pattern.search(str(error)):
                         break
-            else:  # coverage: skip
+            else:  # pragma: no cover
                 assert False, f"did not raise {error_type} matching {error_pattern!r}"
         finally:
             if clear_after:

tests/test_client/conftest.py

@@ -3,6 +3,11 @@
 import idom
 
 
+@pytest.fixture
+def htm():
+    return idom.install("htm@3.0.4")
+
+
 @pytest.fixture
 def victory():
     return idom.install("victory@35.4.0")

tests/test_client/test_manage.py

@@ -23,7 +23,7 @@ def test_web_module_path_must_exist():
 
 def test_web_module_url(victory):
     assert web_module_exists("victory")
-    assert web_module_url("victory") == "./_snowpack/pkg/victory.js"
+    assert web_module_url("victory") == "./victory.js"
 
 
 def test_web_module_exports(victory):

tests/test_client/test_module.py

@@ -43,7 +43,12 @@ def test_module_from_url():
     assert jquery.url == url
 
 
-def test_module_from_source(driver, driver_wait, display):
+def test_module_from_source(
+    driver,
+    driver_wait,
+    display,
+    htm,  # we need this in order to run the test js module
+):
     test_module = Module("test-module", source_file=HERE / "test_js_module.js")
 
     response_data = idom.Ref(None)