jprdonnelly/pyscript
1
0
Fork 0
mirror of https://github.com/pyscript/pyscript.git synced 2025-12-19 18:27:29 -05:00
Code Issues Projects Releases Wiki Activity

Unskip some tests, delete others (#1742)

Browse Source 
Clean up a bit the testsuite and integration tests.
Highlights:

- Some of the @skipped tests just worked -- I unskipped them
- some worked after some small tweak to adapt to the new pyscript next
- some are still skipped, but I tweaked the skip message to be more precise and descriptive
- Moreover, I killed/removed the ones which no longer make sense in the context of pyscript next; in particular, I removed all the ones which tested Element (which is now gone) and the one which tested py-config features which are no longer needed (e.g., multiple interpreters).

The testsuite passes locally.
This commit is contained in:
Antonio Cuni
2023-09-25 16:14:20 +00:00
committed by GitHub
parent 801c63947a
commit b9a1227e47
9 changed files with 39 additions and 557 deletions
Download Patch File Download Diff File Expand all files Collapse all files

147
pyscript.core/tests/integration/test_py_config.py
View File

@@ -1,45 +1,9 @@
import os
import tarfile
import tempfile
from pathlib import Path
import pytest
import requests
from .support import PyScriptTest, with_execution_thread
PYODIDE_VERSION = "0.23.4"
@pytest.fixture
def pyodide_tar(request):
"""
Fixture which returns a local copy of pyodide. It uses pytest-cache to
avoid re-downloading it between runs.
"""
URL = (
f"https://github.com/pyodide/pyodide/releases/download/{PYODIDE_VERSION}/"
f"pyodide-core-{PYODIDE_VERSION}.tar.bz2"
)
tar_name = Path(URL).name
val = request.config.cache.get(tar_name, None)
if val is None:
response = requests.get(URL, stream=True)
TMP_DIR = tempfile.mkdtemp()
TMP_TAR_LOCATION = os.path.join(TMP_DIR, tar_name)
with open(TMP_TAR_LOCATION, "wb") as f:
f.write(response.raw.read())
val = TMP_TAR_LOCATION
request.config.cache.set(tar_name, val)
return val
def unzip(location, extract_to="."):
file = tarfile.open(name=location, mode="r:bz2")
file.extractall(path=extract_to)
# Disable the main/worker dual testing, for two reasons:
#
# 1. the <py-config> logic happens before we start the worker, so there is
@@ -103,37 +67,6 @@ class TestConfig(PyScriptTest):
)
assert self.console.log.lines[-1] == "config name: app with external config"
# The default pyodide version is newer than
# the one we are loading below (after downloading locally)
# which is 0.22.0
# The test checks if loading a different interpreter is possible
# and that too from a locally downloaded file without needing
# the use of explicit `indexURL` calculation.
@pytest.mark.skip("Interpreters key is not implemented in PyScript Next")
def test_interpreter_config(self, pyodide_tar):
unzip(pyodide_tar, extract_to=self.tmpdir)
self.pyscript_run(
"""
<py-config type="json">
{
"interpreters": [{
"src": "/pyodide/pyodide.js",
"name": "my-own-pyodide",
"lang": "python"
}]
}
</py-config>
<script type="py">
import sys, js
pyodide_version = sys.modules["pyodide"].__version__
js.console.log("version", pyodide_version)
</script>
""",
)
assert self.console.log.lines[-1] == f"version {PYODIDE_VERSION}"
@pytest.mark.skip("FIXME: We need to restore the banner.")
def test_invalid_json_config(self):
@@ -148,14 +81,13 @@ class TestConfig(PyScriptTest):
wait_for_pyscript=False,
)
banner = self.page.wait_for_selector(".py-error")
assert "SyntaxError: Unexpected end of JSON input" in self.console.error.text
#assert "Unexpected end of JSON input" in self.console.error.text
expected = (
"(PY1000): The config supplied: [[ is an invalid JSON and cannot be "
"parsed: SyntaxError: Unexpected end of JSON input"
"(PY1000): Invalid JSON\n"
"Unexpected end of JSON input"
)
assert banner.inner_text() == expected
@pytest.mark.skip("FIXME: We need to restore the banner.")
def test_invalid_toml_config(self):
# we need wait_for_pyscript=False because we bail out very soon,
# before being able to write 'PyScript page fully initialized'
@@ -168,15 +100,15 @@ class TestConfig(PyScriptTest):
wait_for_pyscript=False,
)
banner = self.page.wait_for_selector(".py-error")
assert "SyntaxError: Expected DoubleQuote" in self.console.error.text
#assert "Expected DoubleQuote" in self.console.error.text
expected = (
"(PY1000): The config supplied: [[ is an invalid TOML and cannot be parsed: "
"SyntaxError: Expected DoubleQuote, Whitespace, or [a-z], [A-Z], "
'[0-9], "-", "_" but "\\n" found.'
"(PY1000): Invalid TOML\n"
"Expected DoubleQuote, Whitespace, or [a-z], [A-Z], "
'[0-9], "-", "_" but end of input found.'
)
assert banner.inner_text() == expected
@pytest.mark.skip("FIXME: We need to restore the banner.")
@pytest.mark.skip("FIXME: emit a warning in case of multiple py-config")
def test_multiple_py_config(self):
self.pyscript_run(
"""
@@ -185,13 +117,13 @@ class TestConfig(PyScriptTest):
</py-config>
<py-config>
this is ignored and won't even be parsed
name = "this is ignored"
</py-config>
<script type="py">
import js
config = js.pyscript_get_config()
js.console.log("config name:", config.name)
#config = js.pyscript_get_config()
#js.console.log("config name:", config.name)
</script>
"""
)
@@ -202,54 +134,6 @@ class TestConfig(PyScriptTest):
)
assert banner.text_content() == expected
@pytest.mark.skip("Interpreters key is not implemented in PyScript Next")
def test_no_interpreter(self):
snippet = """
<py-config type="json">
{
"interpreters": []
}
</py-config>
"""
self.pyscript_run(snippet, wait_for_pyscript=False)
div = self.page.wait_for_selector(".py-error")
assert (
div.text_content() == "(PY1000): Fatal error: config.interpreter is empty"
)
@pytest.mark.skip("Interpreters key is not implemented in PyScript Next")
def test_multiple_interpreter(self):
snippet = """
<py-config type="json">
{
"interpreters": [
{
"src": "https://cdn.jsdelivr.net/pyodide/v0.23.2/full/pyodide.js",
"name": "pyodide-0.23.2",
"lang": "python"
},
{
"src": "http://...",
"name": "this will be ignored",
"lang": "this as well"
}
]
}
</py-config>
<script type="py">
import js
js.console.log("hello world");
</script>
"""
self.pyscript_run(snippet)
banner = self.page.wait_for_selector(".py-warning")
expected = (
"Multiple interpreters are not supported yet.Only the first will be used"
)
assert banner.text_content() == expected
assert self.console.log.lines[-1] == "hello world"
def test_paths(self):
self.writefile("a.py", "x = 'hello from A'")
self.writefile("b.py", "x = 'hello from B'")
@@ -273,7 +157,7 @@ class TestConfig(PyScriptTest):
"hello from B",
]
@pytest.mark.skip("FIXME: We need to restore the banner.")
@pytest.mark.skip("FIXME: emit an error if fetch fails")
def test_paths_that_do_not_exist(self):
self.pyscript_run(
"""
@@ -281,16 +165,19 @@ class TestConfig(PyScriptTest):
[[fetch]]
files = ["./f.py"]
</py-config>
<script type="py">
print("this should not be printed")
</script>
""",
wait_for_pyscript=False,
)
expected = "(PY0404): Fetching from URL ./f.py failed with " "error 404"
inner_html = self.page.locator(".py-error").inner_html()
assert expected in inner_html
assert expected in self.console.error.lines[-1]
assert self.console.log.lines == []
def test_paths_from_packages(self):
self.writefile("utils/__init__.py", "")