Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix selenium version #655

Merged
merged 50 commits into from
Apr 18, 2024
Merged
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
ed01758
Merge pull request #487 from WPO-Foundation/master
tkadlec Mar 28, 2022
b338b8b
Merge branch 'prod' of https://github.com/WPO-Foundation/wptagent int…
tkadlec Apr 5, 2022
8fe3ec1
Merge from qa
tkadlec Apr 7, 2022
5a0e810
Merge from qa
tkadlec Apr 14, 2022
0da4a47
Merge from qa
tkadlec Apr 21, 2022
3286b1a
Merge from qa
tkadlec Apr 21, 2022
ea7f872
Merge from qa
tkadlec Apr 26, 2022
e938dc6
Merge from qa
tkadlec May 12, 2022
7ce4e0a
Merge from qa
tkadlec May 17, 2022
93e7e84
Merge from qa
tkadlec May 20, 2022
bf2af33
Merge from qa
tkadlec Jun 8, 2022
7d680fd
Merge from qa
tkadlec Jun 9, 2022
b8fc2bc
Merge from qa
tkadlec Jun 16, 2022
db9c866
Merge from qa
tkadlec Jun 24, 2022
8c9053c
Merge from qa
tkadlec Jun 24, 2022
92740a6
Merge from qa
tkadlec Jun 29, 2022
6cade71
Merge from qa
tkadlec Jul 21, 2022
c3a5384
Merge from qa
tkadlec Jul 21, 2022
e760868
Merge from qa
tkadlec Jul 27, 2022
2472296
Merge from qa
tkadlec Aug 19, 2022
dc4110c
Merge from qa
tkadlec Sep 7, 2022
ba6053b
Merge from qa
tkadlec Sep 30, 2022
7a53dc6
Merge from qa
tkadlec Oct 12, 2022
b22073d
Merge from qa
tkadlec Oct 31, 2022
aefcb77
Merge from qa
tkadlec Nov 8, 2022
3bfcd88
Merge from qa
tkadlec Nov 29, 2022
98546b7
Merge from qa
tkadlec Dec 1, 2022
6295167
Merge from qa
tkadlec Dec 5, 2022
082348f
Merge from qa
tkadlec Dec 13, 2022
eb0906c
Merge from qa
tkadlec Dec 16, 2022
583c912
Merge from qa
tkadlec Dec 16, 2022
3c54800
Merge from qa
tkadlec Jan 12, 2023
aafa7a4
Merge from qa
tkadlec Jan 23, 2023
3f0190b
Merge from qa
tkadlec Jan 25, 2023
106fce7
Merge from qa
tkadlec Jan 25, 2023
834cb7b
Merge from qa
tkadlec Feb 9, 2023
dc86814
Merge from qa
tkadlec Feb 15, 2023
93d88af
Merge from qa
tkadlec Mar 7, 2023
0825593
Merge from qa
tkadlec Mar 10, 2023
04e062d
Merge from qa
tkadlec Apr 5, 2023
6950f14
fixed lh version to 11.5
Feb 23, 2024
1558b44
Merge pull request #646 from catchpoint/fix_lighthouse_version
claud-io Feb 27, 2024
390fed6
Merge pull request #649 from catchpoint/qa
claud-io Feb 28, 2024
a15f2bd
using lh v11.4
Feb 29, 2024
3283bd1
Merge pull request #651 from catchpoint/lh_fix_11_4
claud-io Feb 29, 2024
a5682db
Force selenium version to fix failing firefox tests
lbartoli79 Apr 17, 2024
9615d2e
Merge branch 'master' of github.com:catchpoint/WebPageTest.agent into…
lbartoli79 Apr 18, 2024
89be4e1
Resolved conflicts
lbartoli79 Apr 18, 2024
6676d42
Added back setup_logging
lbartoli79 Apr 18, 2024
f3a29e4
Removed newline
lbartoli79 Apr 18, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions wptagent.py
Original file line number Diff line number Diff line change
Expand Up @@ -1060,6 +1060,19 @@ def get_browser_versions(browsers):
browsers[browser]['version'] = get_file_version(exe)


def fix_selenium_version():
"""
On older python versions we are going to force selenium version 3.141.0,
newer versions are going to use 4.8.3
"""
from internal.os_util import run_elevated
version = '4.8.3'
if sys.version_info[1] == 6:
version = '3.141.0'

run_elevated(sys.executable, f'-m pip install selenium=={version}')


# Constant used for --logformat command line parameter mapping
LOG_FORMATS = ["syslog"]

Expand Down Expand Up @@ -1269,6 +1282,9 @@ def main():
logging.critical("Requires python 2.7")
exit(1)

# Make sure we are using a compatible selenium version
fix_selenium_version()

if options.list:
from internal.ios_device import iOSDevice
ios = iOSDevice()
Expand Down
Loading