update atest env, force MOZ_HEADLESS

deathbeds · Oct 18, 2023 · c613823 · c613823
1 parent 975ac49
commit c613823
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/.github/locks/atest_linux-64.conda.lock b/.github/locks/atest_linux-64.conda.lock
@@ -2,7 +2,7 @@
 #   - conda-forge
 #   - nodefaults
 # dependencies:
-#   - firefox =102
+#   - firefox >=115,<116
 #   - geckodriver
 #   - pip
 #   - robotframework >=6.1
@@ -20,7 +20,7 @@ https://conda.anaconda.org/conda-forge/linux-64/libgomp-13.2.0-h807b86a_2.conda#
 https://conda.anaconda.org/conda-forge/linux-64/_openmp_mutex-4.5-2_gnu.tar.bz2#73aaf86a425cc6e73fcf236a5a46396d
 https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-13.2.0-h807b86a_2.conda#c28003b0be0494f9a7664389146716ff
 https://conda.anaconda.org/conda-forge/linux-64/bzip2-1.0.8-h7f98852_4.tar.bz2#a1fd65c7ccbf10880423d82bca54eb54
-https://conda.anaconda.org/conda-forge/linux-64/firefox-102.15.1esr-hd3aeb46_0.conda#4477128a0c9d79c8b520fa810dd06563
+https://conda.anaconda.org/conda-forge/linux-64/firefox-115.3.1esr-hd3aeb46_0.conda#4d2ab0783a561cc930a83e4b0e1fcf6e
 https://conda.anaconda.org/conda-forge/linux-64/geckodriver-0.33.0-hd2f7af9_0.conda#83664049f2b276cc23bd67d41eb9a4ee
 https://conda.anaconda.org/conda-forge/linux-64/libexpat-2.5.0-hcb278e6_1.conda#6305a3dd2752c76335295da4e581f2fd
 https://conda.anaconda.org/conda-forge/linux-64/libffi-3.4.2-h7f98852_5.tar.bz2#d645c6d2ac96843a2bfaccd2d62b3ac3

diff --git a/.github/locks/atest_osx-64.conda.lock b/.github/locks/atest_osx-64.conda.lock
@@ -2,7 +2,7 @@
 #   - conda-forge
 #   - nodefaults
 # dependencies:
-#   - firefox =102
+#   - firefox >=115,<116
 #   - geckodriver
 #   - pip
 #   - robotframework >=6.1
@@ -21,7 +21,7 @@ https://conda.anaconda.org/conda-forge/osx-64/python_abi-3.12-4_cp312.conda#8720
 https://conda.anaconda.org/conda-forge/osx-64/selenium-manager-4.14.0-h63b85fc_1.conda#d2a9f29886692099dba8e30a52efeb8b
 https://conda.anaconda.org/conda-forge/noarch/tzdata-2023c-h71feb2d_0.conda#939e3e74d8be4dac89ce83b20de2492a
 https://conda.anaconda.org/conda-forge/osx-64/xz-5.2.6-h775f41a_0.tar.bz2#a72f9d4ea13d55d745ff1ed594747f10
-https://conda.anaconda.org/conda-forge/osx-64/firefox-102.15.1esr-he965462_0.conda#d1288008c7f916d9c54b6740cbcd4cd0
+https://conda.anaconda.org/conda-forge/osx-64/firefox-115.3.1esr-he965462_0.conda#2a8151371f6bdb5f7c26c07eebb18412
 https://conda.anaconda.org/conda-forge/osx-64/geckodriver-0.33.0-hf46a32e_0.conda#897200360380560ac85cf0756161dd78
 https://conda.anaconda.org/conda-forge/osx-64/libsqlite-3.43.2-h92b6c6a_0.conda#61b88c5f99f1537ed30b34758bd54d54
 https://conda.anaconda.org/conda-forge/osx-64/openssl-3.1.3-h8a1eda9_0.conda#26f9b58f905547e658e9587f8e8cfe43

diff --git a/.github/locks/atest_win-64.conda.lock b/.github/locks/atest_win-64.conda.lock
@@ -2,7 +2,7 @@
 #   - conda-forge
 #   - nodefaults
 # dependencies:
-#   - firefox =102
+#   - firefox >=115,<116
 #   - geckodriver
 #   - pip
 #   - robotframework >=6.1
@@ -19,7 +19,7 @@ https://conda.anaconda.org/conda-forge/win-64/vc14_runtime-14.36.32532-hdcecf7f_
 https://conda.anaconda.org/conda-forge/win-64/vc-14.3-h64f974e_17.conda#67ff6791f235bb606659bf2a5c169191
 https://conda.anaconda.org/conda-forge/win-64/vs2015_runtime-14.36.32532-h05e6639_17.conda#4618046c39f7c81861e53ded842e738a
 https://conda.anaconda.org/conda-forge/win-64/bzip2-1.0.8-h8ffe710_4.tar.bz2#7c03c66026944073040cb19a4f3ec3c9
-https://conda.anaconda.org/conda-forge/win-64/firefox-102.15.1esr-h63175ca_0.conda#6adb27939a5a16e767c6118e87d7a747
+https://conda.anaconda.org/conda-forge/win-64/firefox-115.3.1esr-h63175ca_0.conda#e3402776b286d1e0e83bf3ea56d90869
 https://conda.anaconda.org/conda-forge/win-64/geckodriver-0.33.0-h611cf2b_0.conda#e5ad5ec7f6140c1fdf9bd2a7927a4f91
 https://conda.anaconda.org/conda-forge/win-64/libffi-3.4.2-h8ffe710_5.tar.bz2#2c96d1b6915b408893f9472569dee135
 https://conda.anaconda.org/conda-forge/win-64/libsqlite-3.43.2-hcfcfb64_0.conda#a4a81906f6ce911113f672973777f305

diff --git a/.github/specs/_atest.yml b/.github/specs/_atest.yml
@@ -1,5 +1,5 @@
 dependencies:
-  - firefox =102
+  - firefox >=115,<116
   - geckodriver
   - robotframework >=6.1
   - robotframework-jupyterlibrary >=0.5.0

diff --git a/scripts/actions.py b/scripts/actions.py
@@ -104,6 +104,11 @@ def maybe_atest_one(
 
     dry_run = not attempt
 
+    env = dict(os.environ)
+
+    if "MOZ_HEADLESS" not in env:
+        env.update(MOZ_HEADLESS="1")
+
     if attempt >= 2 and prev_out and prev_out[0]:
         prev_rc_path = Path(prev_out[0]) / rc_name
         prev_rc = prev_rc_path.read_text(**UTF8).strip()
@@ -155,7 +160,7 @@ def maybe_atest_one(
     args += atest_dir
 
     print(">>>", "  ".join(args))
-    rc = subprocess.call(args)
+    rc = subprocess.call(args, env=env)
     print(f"   ... returned {rc}")
 
     rc_path.write_text(f"{rc}", **UTF8)