Merge branch 'main' into fix/update-diagrams

IRL2 · Sep 30, 2024 · e233cc5 · e233cc5
2 parents 4f423db + 7909ce6
commit e233cc5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/python-libraries/nanover-essd/tests/test_essd_client_server.py b/python-libraries/nanover-essd/tests/test_essd_client_server.py
@@ -72,7 +72,7 @@ def test_remove_service(client_server, service):
     )
     assert service in services
     server.unregister_service(service)
-    time.sleep(TEST_INTERVAL_TIME)
+    time.sleep(TEST_SEARCH_TIME)
     services = set(
         client.search_for_services(
             search_time=TEST_SEARCH_TIME, interval=TEST_INTERVAL_TIME

diff --git a/python-libraries/nanover-lammps/tests/test_lammps_converter.py b/python-libraries/nanover-lammps/tests/test_lammps_converter.py
@@ -7,6 +7,16 @@
 import sys
 
 
+pytestmark = pytest.mark.skipif(
+    sys.platform == "win32",
+    reason=(
+        "These tests can break the windows test runner on github. "
+        "This is tracked in issue #33: "
+        "<https://github.com/IRL2/nanover-protocol/issues/33>."
+    ),
+)
+
+
 @pytest.fixture
 def simple_atom_lammps_frame():
     mock = MockLammps()
@@ -16,7 +26,7 @@ def simple_atom_lammps_frame():
 
 @pytest.fixture
 def lammps_hook():
-    with LammpsImd() as hook:
+    with LammpsImd(port=0) as hook:
         yield hook