Fixed Tests

.github/workflows/test.yml

@@ -2,7 +2,11 @@ name: Test Eel
 
 on:
   push:
-    branches: [ master ]
+    branches:
+      [master]
+      # - '*'
+      # - '!master'
+
   pull_request:
 
 jobs:
@@ -12,7 +16,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-20.04, windows-latest, macos-latest]
-        python-version: [3.6, 3.7, 3.8, 3.9, "3.10"]
+        python-version: [3.6, 3.7, 3.8, 3.9, '3.10']
 
     steps:
       - name: Checkout repository

.gitignore

@@ -1,5 +1,6 @@
 __pycache__
 dist
+Drivers
 build
 Eel.egg-info
 .tmp

Drivers/.wdm/drivers.json

@@ -0,0 +1,6 @@
+{
+    "win32_chromedriver_107.0.5304_for_107.0.5304": {
+        "timestamp": "15/11/2022",
+        "binary_path": ".\\\\Drivers\\.wdm\\drivers\\chromedriver\\win32\\107.0.5304\\chromedriver.exe"
+    }
+}

requirements-meta.txt

@@ -1,4 +1,4 @@
-tox>=3.15.2,<4.0.0
+tox>=3.27.1,<4.0.0
 tox-pyenv==1.1.0
-tox-gh-actions==1.3.0
-virtualenv>=16.7.10
+tox-gh-actions==2.11.0
+virtualenv>=16.7.10

requirements-test.txt

@@ -4,3 +4,4 @@ psutil==5.9.2
 pytest==7.0.1
 pytest-timeout==2.1.0
 selenium==3.141.0
+webdriver_manager==3.7.1

tests/conftest.py

@@ -1,9 +1,11 @@
 import os
+import platform
 from unittest import mock
 
 import pytest
 from selenium import webdriver
 from selenium.webdriver import DesiredCapabilities
+from webdriver_manager.chrome import ChromeDriverManager
 
 
 @pytest.fixture
@@ -16,7 +18,11 @@ def driver():
         capabilities = DesiredCapabilities.CHROME
         capabilities['goog:loggingPrefs'] = {"browser": "ALL"}
 
-        driver = webdriver.Chrome(options=options, desired_capabilities=capabilities, service_log_path=os.path.devnull)
+        if platform.system() == 'Windows':
+            options.binary_location = "C:/Program Files/Google/Chrome/Application/chrome.exe"
+
+        driver = webdriver.Chrome(ChromeDriverManager().install(), options=options, desired_capabilities=capabilities, service_log_path=os.path.devnull)
+        #driver = webdriver.Chrome()
 
     # Firefox doesn't currently supported pulling JavaScript console logs, which we currently scan to affirm that
     # JS/Python can communicate in some places. So for now, we can't really use firefox/geckodriver during testing.

tests/integration/test_examples.py

@@ -1,4 +1,5 @@
 import os
+import time
 from tempfile import TemporaryDirectory, NamedTemporaryFile
 
 from selenium import webdriver
@@ -10,52 +11,69 @@
 
 
 def test_01_hello_world(driver):
-    with get_eel_server('examples/01 - hello_world/hello.py', 'hello.html') as eel_url:
+    with get_eel_server("examples/01 - hello_world/hello.py", "hello.html") as eel_url:
         driver.get(eel_url)
         assert driver.title == "Hello, World!"
 
         console_logs = get_console_logs(driver, minimum_logs=2)
-        assert "Hello from Javascript World!" in console_logs[0]['message']
-        assert "Hello from Python World!" in console_logs[1]['message']
+        assert "Hello from Javascript World!" in console_logs[0]["message"]
+        assert "Hello from Python World!" in console_logs[1]["message"]
 
 
 def test_02_callbacks(driver):
-    with get_eel_server('examples/02 - callbacks/callbacks.py', 'callbacks.html') as eel_url:
+    with get_eel_server(
+        "examples/02 - callbacks/callbacks.py", "callbacks.html"
+    ) as eel_url:
         driver.get(eel_url)
         assert driver.title == "Callbacks Demo"
 
         console_logs = get_console_logs(driver, minimum_logs=1)
-        assert "Got this from Python:" in console_logs[0]['message']
-        assert "callbacks.html" in console_logs[0]['message']
+        assert "Got this from Python:" in console_logs[0]["message"]
+        assert "callbacks.html" in console_logs[0]["message"]
 
 
 def test_03_callbacks(driver):
-    with get_eel_server('examples/03 - sync_callbacks/sync_callbacks.py', 'sync_callbacks.html') as eel_url:
+    with get_eel_server(
+        "examples/03 - sync_callbacks/sync_callbacks.py", "sync_callbacks.html"
+    ) as eel_url:
         driver.get(eel_url)
         assert driver.title == "Synchronous callbacks"
 
         console_logs = get_console_logs(driver, minimum_logs=1)
-        assert "Got this from Python:" in console_logs[0]['message']
-        assert "callbacks.html" in console_logs[0]['message']
+        assert "Got this from Python:" in console_logs[0]["message"]
+        assert "callbacks.html" in console_logs[0]["message"]
 
 
 def test_04_file_access(driver: webdriver.Remote):
-    with get_eel_server('examples/04 - file_access/file_access.py', 'file_access.html') as eel_url:
+    with get_eel_server(
+        "examples/04 - file_access/file_access.py", "file_access.html"
+    ) as eel_url:
         driver.get(eel_url)
         assert driver.title == "Eel Demo"
 
-        with TemporaryDirectory() as temp_dir, NamedTemporaryFile(dir=temp_dir) as temp_file:
-            driver.find_element_by_id('input-box').clear()
-            driver.find_element_by_id('input-box').send_keys(temp_dir)
-            driver.find_element_by_css_selector('button').click()
+        with TemporaryDirectory() as temp_dir, NamedTemporaryFile(
+            dir=temp_dir
+        ) as temp_file:
+            driver.find_element_by_id("input-box").clear()
+            driver.find_element_by_id("input-box").send_keys(temp_dir)
+            time.sleep(1)
+            driver.find_element_by_css_selector("button").click()
 
-            assert driver.find_element_by_id('file-name').text == os.path.basename(temp_file.name)
+            assert driver.find_element_by_id("file-name").text == os.path.basename(
+                temp_file.name
+            )
 
 
 def test_06_jinja_templates(driver: webdriver.Remote):
-    with get_eel_server('examples/06 - jinja_templates/hello.py', 'templates/hello.html') as eel_url:
+    with get_eel_server(
+        "examples/06 - jinja_templates/hello.py", "templates/hello.html"
+    ) as eel_url:
         driver.get(eel_url)
         assert driver.title == "Hello, World!"
 
-        driver.find_element_by_css_selector('a').click()
-        WebDriverWait(driver, 2.0).until(expected_conditions.presence_of_element_located((By.XPATH, '//h1[text()="This is page 2"]')))
+        driver.find_element_by_css_selector("a").click()
+        WebDriverWait(driver, 2.0).until(
+            expected_conditions.presence_of_element_located(
+                (By.XPATH, '//h1[text()="This is page 2"]')
+            )
+        )

tests/utils.py

@@ -1,22 +1,45 @@
 import contextlib
 import os
+import sys
+import platform
 import subprocess
+
+# Hack for python 3.6
+subprocess._cleanup = lambda: None
 import tempfile
 import time
 from pathlib import Path
 
 import psutil
 
 # Path to the test data folder.
-TEST_DATA_DIR = Path(__file__).parent / 'data'
+TEST_DATA_DIR = Path(__file__).parent / "data"
 
 
 def get_process_listening_port(proc):
-    psutil_proc = psutil.Process(proc.pid)
-    while not any(conn.status == 'LISTEN' for conn in psutil_proc.connections()):
-        time.sleep(0.01)
+    conn = None
+    if platform.system() == "Windows":
+        current_process = psutil.Process(proc.pid)
+        children = current_process.children(recursive=True)
+        if children == []:
+            children = [current_process]
+        for child in children:
+            if child.connections() != []:
+                while not any(conn.status == "LISTEN" for conn in child.connections()):
+                    time.sleep(0.01)
+
+                conn = next(
+                    filter(lambda conn: conn.status == "LISTEN", child.connections())
+                )
+    else:
+        psutil_proc = psutil.Process(proc.pid)
+        while not any(conn.status == "LISTEN" for conn in psutil_proc.connections()):
+            time.sleep(0.01)
+
+        conn = next(
+            filter(lambda conn: conn.status == "LISTEN", psutil_proc.connections())
+        )
 
-    conn = next(filter(lambda conn: conn.status == 'LISTEN', psutil_proc.connections()))
     return conn.laddr.port
 
 
@@ -26,22 +49,34 @@ def get_eel_server(example_py, start_html):
     test = None
 
     try:
-        with tempfile.NamedTemporaryFile(mode='w', dir=os.path.dirname(example_py), delete=False) as test:
+        with tempfile.NamedTemporaryFile(
+            mode="w", dir=os.path.dirname(example_py), delete=False
+        ) as test:
             # We want to run the examples unmodified to keep the test as realistic as possible, but all of the examples
             # want to launch browsers, which won't be supported in CI. The below script will configure eel to open on
             # a random port and not open a browser, before importing the Python example file - which will then
             # do the rest of the set up and start the eel server. This is definitely hacky, and means we can't
             # test mode/port settings for examples ... but this is OK for now.
-            test.write(f"""
+            test.write(
+                f"""
 import eel
 
 eel._start_args['mode'] = None
 eel._start_args['port'] = 0
 
 import {os.path.splitext(os.path.basename(example_py))[0]}
-""")
-
-        proc = subprocess.Popen(['python', test.name], cwd=os.path.dirname(example_py))
+"""
+            )
+        if platform.system() == "Windows":
+            proc = subprocess.Popen(
+                [sys.executable, test.name],
+                cwd=os.path.dirname(example_py),
+            )
+        else:
+            proc = subprocess.Popen(
+                ["python", test.name], cwd=os.path.dirname(example_py)
+            )
+        time.sleep(1)
         eel_port = get_process_listening_port(proc)
 
         yield f"http://localhost:{eel_port}/{start_html}"
@@ -57,10 +92,10 @@ def get_eel_server(example_py, start_html):
 
 
 def get_console_logs(driver, minimum_logs=0):
-    console_logs = driver.get_log('browser')
+    console_logs = driver.get_log("browser")
 
     while len(console_logs) < minimum_logs:
-        console_logs += driver.get_log('browser')
+        console_logs += driver.get_log("browser")
         time.sleep(0.1)
 
     return console_logs

tox.ini

@@ -2,7 +2,8 @@
 envlist = py36,py37,py38,py39,py310
 
 [pytest]
-timeout = 5
+pythonpath = . eel
+timeout = 60
 
 [gh-actions]
 python =
@@ -14,8 +15,8 @@ python =
 
 [testenv]
 deps = -r requirements-test.txt
-commands =
+commands = '{envpython}' -m pytest {posargs}
   # this ugly hack is here because:
   # https://github.com/tox-dev/tox/issues/149
-  pip install -q -r {toxinidir}/requirements-test.txt
-  {envpython} -m pytest {posargs}
+  ; pip install -q -r '{toxinidir}'/requirements-test.txt
+  ; '{envpython}' -m pytest {posargs}