Merge pull request #186 from plotly/andrew/flags

Add single-process to flags

Author: ayjayt

choreographer/browser_async.py

@@ -179,8 +179,9 @@ async def _close(self) -> None:
             return
         except ChannelClosedError:
             _logger.debug("Can send browser.close on close channel")
-
         await asyncio.to_thread(self._channel.close)
+        if await self._is_closed(wait=2):
+            return
 
         if await self._is_closed():
             _logger.debug("Browser is closed after closing channel")

choreographer/utils/_kill.py

@@ -3,6 +3,10 @@
 import platform
 import subprocess
 
+import logistro
+
+_logger = logistro.getLogger(__name__)
+
 
 def kill(process: subprocess.Popen[bytes]) -> None:
     if platform.system() == "Windows":
@@ -13,5 +17,7 @@ def kill(process: subprocess.Popen[bytes]) -> None:
         )
     else:
         process.terminate()
+        _logger.info("Called terminate")
         if process.poll() is None:
+            _logger.info("Calling kill")
             process.kill()

choreographer/utils/_tmpfile.py

@@ -193,7 +193,7 @@ def extra_clean() -> None:
                     _logger.info(f"Extra manual clean executing {i}.")
                     self._delete_manually(quiet=True)
                     i += 1
-                    time.sleep(2)
+                    time.sleep(10)
                 if self.path.exists():
                     self._delete_manually(quiet=False)
 

tests/conftest.py

@@ -89,7 +89,7 @@ async def wrapped_test_fn(*args, **kwargs):
 
 def pytest_configure():
     # change this by command line TODO
-    pytest.default_timeout = 20
+    pytest.default_timeout = 60
 
 
 # pytest shuts down its capture before logging/threads finish