mirror of
https://github.com/pyscript/pyscript.git
synced 2025-12-20 10:47:35 -05:00
214e39537b
Major highlights: 1. Merge&simplify base.ts and pyrepl.ts; kill base.ts 2. improve and extente the py-repl integration tests 3. Reorder the code in pyrepl.ts. This part of the PR doesn't change much of the concrete logic: it's just a sequence of renaming variables, moving code around, group code into functions, killing code which is no longer needed. But the end result is much better and nicer to read, IMHO. Minor highlights: 1. py-repl now uses the new logic in pyexec.ts to run the code 2. after PR Add display impl, rm outputManage, print and console.log default to browser console #749 py-repl no longer displayed the result of the last evaluated expression (e.g. if you typed 42 and run it, it displayed nothing). This PR re-introduces this behavior, which is what you would expect by a REPL. 3. improve the pytest --dev option: now it implies --no-fake-server so that sourcemaps works automatically 4. improve the names of the CSS classes to be more consistent 5. kill pyrepl.test.ts: the old tests didn't check anything useful, this style of unit test doesn't really add much value if you have good integration tests (which now we have) and trying to revive them was not worth the hassle
120 lines
3.3 KiB
Python
120 lines
3.3 KiB
Python
import threading
|
|
from http.server import HTTPServer as SuperHTTPServer
|
|
from http.server import SimpleHTTPRequestHandler
|
|
|
|
import pytest
|
|
|
|
from .support import Logger
|
|
|
|
|
|
def pytest_configure(config):
|
|
"""
|
|
THIS IS A WORKAROUND FOR A pytest QUIRK!
|
|
|
|
At the moment of writing this conftest defines two new options, --dev and
|
|
--no-fake-server, but because of how pytest works, they are available only
|
|
if this is the "root conftest" for the test session.
|
|
|
|
This means that if you are in the pyscriptjs directory:
|
|
|
|
$ py.test # does NOT work
|
|
$ py.test tests/integration/ # works
|
|
|
|
This happens because there is also test py-unit directory, so in the first
|
|
case the "root conftest" would be tests/conftest.py (which doesn't exist)
|
|
instead of this.
|
|
|
|
There are various workarounds, but for now we can just detect it and
|
|
inform the user.
|
|
|
|
Related StackOverflow answer: https://stackoverflow.com/a/51733980
|
|
"""
|
|
if not hasattr(config.option, "dev"):
|
|
msg = """
|
|
Running a bare "pytest" command from the pyscriptjs directory
|
|
is not supported. Please use one of the following commands:
|
|
- pytest tests/integration
|
|
- pytest tests/py-unit
|
|
- pytest tests/*
|
|
- cd tests/integration; pytest
|
|
"""
|
|
pytest.fail(msg)
|
|
|
|
|
|
@pytest.fixture(scope="session")
|
|
def logger():
|
|
return Logger()
|
|
|
|
|
|
def pytest_addoption(parser):
|
|
parser.addoption(
|
|
"--no-fake-server",
|
|
action="store_true",
|
|
help="Use a real HTTP server instead of http://fakeserver",
|
|
)
|
|
parser.addoption(
|
|
"--dev",
|
|
action="store_true",
|
|
help="Automatically open a devtools panel. Implies --headed and --no-fake-server",
|
|
)
|
|
|
|
|
|
def pytest_configure(config):
|
|
if config.option.dev:
|
|
config.option.headed = True
|
|
config.option.no_fake_server = True
|
|
|
|
|
|
@pytest.fixture(scope="session")
|
|
def browser_type_launch_args(request):
|
|
"""
|
|
Override the browser_type_launch_args defined by pytest-playwright to
|
|
support --devtools.
|
|
|
|
NOTE: this has been tested with pytest-playwright==0.3.0. It might break
|
|
with newer versions of it.
|
|
"""
|
|
# this calls the "original" fixture defined by pytest_playwright.py
|
|
launch_options = request.getfixturevalue("browser_type_launch_args")
|
|
if request.config.option.dev:
|
|
launch_options["devtools"] = True
|
|
return launch_options
|
|
|
|
|
|
class HTTPServer(SuperHTTPServer):
|
|
"""
|
|
Class for wrapper to run SimpleHTTPServer on Thread.
|
|
Ctrl +Only Thread remains dead when terminated with C.
|
|
Keyboard Interrupt passes.
|
|
"""
|
|
|
|
def run(self):
|
|
try:
|
|
self.serve_forever()
|
|
except KeyboardInterrupt:
|
|
pass
|
|
finally:
|
|
self.server_close()
|
|
|
|
|
|
@pytest.fixture(scope="session")
|
|
def http_server(logger):
|
|
class MyHTTPRequestHandler(SimpleHTTPRequestHandler):
|
|
def log_message(self, fmt, *args):
|
|
logger.log("http_server", fmt % args, color="blue")
|
|
|
|
host, port = "127.0.0.1", 8080
|
|
base_url = f"http://{host}:{port}"
|
|
|
|
# serve_Run forever under thread
|
|
server = HTTPServer((host, port), MyHTTPRequestHandler)
|
|
|
|
thread = threading.Thread(None, server.run)
|
|
thread.start()
|
|
|
|
yield base_url # Transition to test here
|
|
|
|
# End thread
|
|
server.shutdown()
|
|
thread.join()
|