Minor code style adaptations.

diff --git a/src/ledgplom/http.py b/src/ledgplom/http.py
index 38fb747f9e1fb50e0dff69ac95eca45047b1b1ad..1fe17edb4ee32c1c87fb994e2aa67e97fc8b12e2 100644 (file)
--- a/src/ledgplom/http.py
+++ b/src/ledgplom/http.py
@@ -13,7 +13,7 @@ _PREFIX_EDIT = 'edit'
 _PREFIX_FILE = 'file'
 _PREFIX_LEDGER = 'ledger'
 _SERVER_HOST = '127.0.0.1'
 _PREFIX_FILE = 'file'
 _PREFIX_LEDGER = 'ledger'
 _SERVER_HOST = '127.0.0.1'

-_SERVER_PORT = 8084
+SERVER_PORT = 8084

 _SUFFIX_HTML = '.html'
 _SUFFIX_JS = '.js'
 _SUFFIX_STRUCTURED = 'structured'
 _SUFFIX_HTML = '.html'
 _SUFFIX_JS = '.js'
 _SUFFIX_STRUCTURED = 'structured'


@@ -25,7 +25,7 @@ class Server(PlomHttpServer):
 
     def __init__(self, path_dat: Path, *args, **kwargs) -> None:
         super().__init__(_PATH_TEMPLATES,
 
     def __init__(self, path_dat: Path, *args, **kwargs) -> None:
         super().__init__(_PATH_TEMPLATES,

-                         (_SERVER_HOST, _SERVER_PORT),
+                         (_SERVER_HOST, SERVER_PORT),

                          _Handler)
         self.ledger = Ledger(path_dat)
         self.jinja.trim_blocks = True
                          _Handler)
         self.ledger = Ledger(path_dat)
         self.jinja.trim_blocks = True

diff --git a/src/ledgplom/testing.py b/src/ledgplom/testing.py
index bf528fe5de35aa1227cc9bf3cb4fe29de05d0f48..beb83c934330fbdd6cb4ff4eac28205317a6d659 100644 (file)
--- a/src/ledgplom/testing.py
+++ b/src/ledgplom/testing.py
@@ -7,7 +7,7 @@ from typing import Optional
 # requirements.txt
 from playwright.sync_api import sync_playwright
 # ourselves
 # requirements.txt
 from playwright.sync_api import sync_playwright
 # ourselves

-from ledgplom.http import Server
+from ledgplom.http import Server, SERVER_PORT

 from plomlib.web import PlomHttpServer
 
 
 from plomlib.web import PlomHttpServer
 
 


@@ -19,7 +19,7 @@ def run_tests() -> None:
     'Run tests from tests directory.'
     paths = tuple(_PATH_TESTS.iterdir())
 
     'Run tests from tests directory.'
     paths = tuple(_PATH_TESTS.iterdir())
 

-    def f(dat_path: Path, server: PlomHttpServer):
+    def run_tests_on_dat(dat_path: Path, server: PlomHttpServer) -> None:

 
         def fail(abort_msg: str, msg_prefix: str, idx: Optional[int]) -> None:
             for jdx, line in enumerate(lines_rendered[:idx], start=1):
 
         def fail(abort_msg: str, msg_prefix: str, idx: Optional[int]) -> None:
             for jdx, line in enumerate(lines_rendered[:idx], start=1):


@@ -33,9 +33,9 @@ def run_tests() -> None:
         for test_path in [p for p in paths
                           if p != dat_path
                           and p.parts[-1].startswith(f'{test_name}.')]:
         for test_path in [p for p in paths
                           if p != dat_path
                           and p.parts[-1].startswith(f'{test_name}.')]:

-            path = str(test_path.parts[-1]
-                       ).split('.', maxsplit=1)[1].replace('.', '/')
-            page.goto(f'http://localhost:8084/{path}')
+            page.goto(f'http://localhost:{SERVER_PORT}/'
+                      + str(test_path.parts[-1]).split('.', maxsplit=1
+                                                       )[1].replace('.', '/'))

             lines_rendered = page.content().split('\n')
             with test_path.open('r', encoding='utf8') as f:
                 lines_expected = tuple(line.rstrip('\n')
             lines_rendered = page.content().split('\n')
             with test_path.open('r', encoding='utf8') as f:
                 lines_expected = tuple(line.rstrip('\n')


@@ -59,5 +59,5 @@ def run_tests() -> None:
 
     for dat_path in [p for p in paths if p.parts[-1].endswith(_EXT_DAT)]:
         server = Server(dat_path)
 
     for dat_path in [p for p in paths if p.parts[-1].endswith(_EXT_DAT)]:
         server = Server(dat_path)

-        Thread(target=f, args=(dat_path, server,)).start()
+        Thread(target=run_tests_on_dat, args=(dat_path, server,)).start()

         server.serve()
         server.serve()