Skip to content

Commit 0bf97e3

Browse files
committed
fix up tests
1 parent 0dad734 commit 0bf97e3

File tree

5 files changed

+18
-29
lines changed

5 files changed

+18
-29
lines changed

Diff for: docs/source/examples/material_ui_slider.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55

66
material_ui = idom.Module("@material-ui/core")
7-
Slider = material_ui.Import("Slider")
7+
Slider = material_ui.Import("Slider", fallback="loading...")
88

99
material_ui_style = idom.html.link(
1010
{

Diff for: idom/client/manage.py

+8-7
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ def delete_web_modules(names: Sequence[str], skip_missing: bool = False) -> None
7979
if not exists and not skip_missing:
8080
raise ValueError(f"Module '{name}' does not exist.")
8181

82-
cache.delete_package(name)
82+
cache.delete_package(name, skip_missing)
8383

8484
for p in paths:
8585
_delete_os_paths(p)
@@ -158,12 +158,13 @@ def add_packages(self, packages: Sequence[str], exports: Sequence[str]) -> None:
158158
self.package_list = list(set(self.package_list + package_list))
159159
self.export_list = list(set(self.export_list + export_list))
160160

161-
def delete_package(self, export_name: str) -> None:
162-
self.export_list.remove(export_name)
163-
for i, pkg in enumerate(self.package_list):
164-
if _export_name_from_package(pkg) == export_name:
165-
del self.package_list[i]
166-
break
161+
def delete_package(self, export_name: str, skip_missing: bool) -> None:
162+
if export_name in self.export_list:
163+
self.export_list.remove(export_name)
164+
for i, pkg in enumerate(self.package_list):
165+
if _export_name_from_package(pkg) == export_name:
166+
del self.package_list[i]
167+
break
167168

168169
def save(self) -> None:
169170
cache = {

Diff for: idom/server/sanic.py

+9-8
Original file line numberDiff line numberDiff line change
@@ -88,14 +88,15 @@ async def client_files(
8888
) -> response.HTTPResponse:
8989
file_extensions = [".html", ".js", ".json"]
9090
abs_path = find_path(path)
91-
if (
92-
abs_path is not None
93-
and abs_path.suffix in file_extensions
94-
and not abs_path.stem.startswith(".")
95-
):
96-
return await response.file_stream(str(abs_path))
97-
else:
98-
response.text(f"Could not find: {path!r}", status=404)
91+
return (
92+
await response.file_stream(str(abs_path))
93+
if (
94+
abs_path is not None
95+
and abs_path.suffix in file_extensions
96+
and not abs_path.stem.startswith(".")
97+
)
98+
else response.text(f"Could not find: {path!r}", status=404)
99+
)
99100

100101
if config["redirect_root_to_index"]:
101102

Diff for: tests/test_client/test_manage.py

-4
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66

77
from idom import client
88

9-
from .utils import assert_file_is_touched
10-
119

1210
@pytest.mark.slow
1311
def test_install():
@@ -17,8 +15,6 @@ def test_install():
1715
assert client.web_module_exists("jquery")
1816
assert client.web_module_exists("/jquery") # works with a leading slash too
1917
assert "jquery" in client.installed()
20-
with assert_file_is_touched(client.web_module_path("jquery")):
21-
client.install("jquery", force=True)
2218

2319
with pytest.raises(ValueError, match="already exists"):
2420
# can't register a module with the same name

Diff for: tests/test_main.py

-9
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
from idom.__main__ import main
44
from idom import client
55

6-
from tests.test_client.utils import assert_file_is_touched
7-
86
from tests.general_utils import assert_same_items
97

108

@@ -18,10 +16,6 @@ def test_simple_install(capsys):
1816
captured = capsys.readouterr()
1917
assert "- jquery" in captured.out
2018

21-
with assert_file_is_touched(client.web_module_path("jquery")):
22-
main("install", "jquery", "--force")
23-
assert client.web_module_exists("jquery")
24-
2519
main("uninstall", "jquery")
2620
assert not client.web_module_exists("jquery")
2721

@@ -57,11 +51,8 @@ def test_restore(capsys):
5751
"args, error",
5852
[
5953
(("uninstall", "x", "--exports"), ValueError("does not support exports")),
60-
(("uninstall", "x", "--force"), ValueError("does not support force")),
6154
(("installed", "--exports"), ValueError("does not support exports")),
62-
(("installed", "--force"), ValueError("does not support force")),
6355
(("restore", "--exports"), ValueError("does not support exports")),
64-
(("restore", "--force"), ValueError("does not support force")),
6556
],
6657
)
6758
def test_bad_options(capsys, args, error):

0 commit comments

Comments
 (0)