Merge pull request #190 from plotly/andrew/flags

Andrew/flags

CHANGELOG.txt

@@ -0,0 +1,3 @@
+v1.0.0a11
+- Increase wait for checking regular close
+- Decrease freeze for manual bad-close cleanup

choreographer/browser_async.py

@@ -179,8 +179,10 @@ 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):
+
+        if await self._is_closed(wait=3):
             return
 
         if await self._is_closed():

choreographer/browser_sync.py

@@ -133,12 +133,14 @@ def _close(self) -> None:
         try:
             self.send_command("Browser.close")
         except (BrowserClosedError, BrowserFailedError):
+            _logger.debug("Browser is closed trying to send Browser.close")
             return
         except ChannelClosedError:
-            pass
+            _logger.debug("Can send browser.close on close channel")
 
         self._channel.close()
-        if self._is_closed():
+
+        if self._is_closed(wait=3):
             return
 
         # try kiling

choreographer/cli/_cli_utils_no_qa.py

@@ -1,6 +1,5 @@
 import argparse
-
-# import asyncio
+import asyncio
 import platform
 import subprocess
 import sys
@@ -28,8 +27,7 @@ def diagnose() -> None:
 
     logistro.getLogger().setLevel("DEBUG")
 
-    # from choreographer import BrowserSync, Browser, browser_which
-    from choreographer import BrowserSync
+    from choreographer import Browser, BrowserSync
     from choreographer.browsers._chrome_constants import chrome_names
     from choreographer.utils._which import browser_which
 
@@ -85,15 +83,15 @@ def diagnose() -> None:
             fail.append(("Sync test headless", e))
         finally:
             print("Done with sync test headless".center(50, "*"))
-        # ruff: noqa: ERA001
-        # async def test_headless():
-        #    browser = await Browser(debug=True, debug_browser=True, headless=headless)
-        #    await asyncio.sleep(3)
-        #    await browser.close()
+
+        async def test_headless() -> None:
+            browser = await Browser(debug=True, debug_browser=True, headless=headless)
+            await asyncio.sleep(3)
+            await browser.close()
 
         try:
             print("Async Test Headless".center(50, "*"))
-        #    asyncio.run(test_headless())
+            asyncio.run(test_headless())
         except BaseException as e:
             fail.append(("Async test headless", e))
         finally:

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(10)
+                    time.sleep(2)
                 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 = 60
+    pytest.default_timeout = 20
 
 
 # pytest shuts down its capture before logging/threads finish