diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 4b7b6fd..c5723ab 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,19 +1,19 @@ repos: - - repo: https://github.com/psf/black - rev: 24.1.1 + - repo: https://github.com/psf/black-pre-commit-mirror + rev: 26.1.0 hooks: - id: black args: [--safe, --quiet] language_version: python3 - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.5.0 + rev: v6.0.0 hooks: - id: trailing-whitespace - id: end-of-file-fixer - repo: https://github.com/PyCQA/flake8 - rev: 7.0.0 + rev: 7.3.0 hooks: - id: flake8 exclude: docs diff --git a/src/pytest_selenium/drivers/saucelabs.py b/src/pytest_selenium/drivers/saucelabs.py index a8f375d..c2c09f8 100644 --- a/src/pytest_selenium/drivers/saucelabs.py +++ b/src/pytest_selenium/drivers/saucelabs.py @@ -146,9 +146,7 @@ def _video_html(session): "url":"https://assets.saucelabs.com/jobs/{session}/video.flv",\ "provider":"streamer",\ "autoPlay":false,\ - "autoBuffering":true}}]}}'.format( - session=session - ) + "autoBuffering":true}}]}}'.format(session=session) return ( f'
should not be present!') except KeyError: pass - """ - ) + """) run_sauce_test(monkeypatch, testdir, file_test) @@ -168,17 +162,13 @@ def run_w3c_sauce_test(capabilities, expected_result, monkeypatch, testdir): ".json", '{{"capabilities": {}}}'.format(json.dumps(capabilities)) ) - file_test = testdir.makepyfile( - """ + file_test = testdir.makepyfile(""" import pytest @pytest.mark.nondestructive def test_sauce_capabilities(driver_kwargs): actual = driver_kwargs['options'].capabilities['sauce:options'] assert actual == {} - """.format( - expected_result - ) - ) + """.format(expected_result)) testdir.quick_qa( "--driver", "saucelabs", "--variables", variables, file_test, passed=1 @@ -219,21 +209,17 @@ def test_data_center_option(testdir, monkeypatch): monkeypatch.setenv("SAUCELABS_API_KEY", "bar") expected_data_center = "us-east-1" - testdir.makeini( - f""" + testdir.makeini(f""" [pytest] saucelabs_data_center = {expected_data_center} - """ - ) + """) - file_test = testdir.makepyfile( - f""" + file_test = testdir.makepyfile(f""" import pytest @pytest.mark.nondestructive def test_pass(driver_kwargs): assert "{expected_data_center}" in driver_kwargs['command_executor'] - """ - ) + """) testdir.quick_qa("--driver", "SauceLabs", file_test, passed=1) @@ -245,14 +231,12 @@ def test_data_center_option_file(testdir, monkeypatch, tmpdir): expected_data_center = "us-east-1" tmpdir.join(".saucelabs").write(f"[options]\ndata_center={expected_data_center}") - file_test = testdir.makepyfile( - f""" + file_test = testdir.makepyfile(f""" import pytest @pytest.mark.nondestructive def test_pass(driver_kwargs): assert "{expected_data_center}" in driver_kwargs['command_executor'] - """ - ) + """) testdir.quick_qa("--driver", "SauceLabs", file_test, passed=1) @@ -264,21 +248,17 @@ def test_data_center_option_precedence(testdir, monkeypatch, tmpdir): expected_data_center = "us-east-1" tmpdir.join(".saucelabs").write(f"[options]\ndata_center={expected_data_center}") - testdir.makeini( - """ + testdir.makeini(""" [pytest] saucelabs_data_center = "ap-east-1" - """ - ) + """) - file_test = testdir.makepyfile( - f""" + file_test = testdir.makepyfile(f""" import pytest @pytest.mark.nondestructive def test_pass(driver_kwargs): assert "{expected_data_center}" in driver_kwargs['command_executor'] - """ - ) + """) testdir.quick_qa("--driver", "SauceLabs", file_test, passed=1) diff --git a/testing/test_testingbot.py b/testing/test_testingbot.py index 02036db..3c31d92 100644 --- a/testing/test_testingbot.py +++ b/testing/test_testingbot.py @@ -18,13 +18,11 @@ @pytest.fixture def testfile(testdir): - return testdir.makepyfile( - """ + return testdir.makepyfile(""" import pytest @pytest.mark.nondestructive def test_pass(selenium): pass - """ - ) + """) def failure_with_output(testdir, *args, **kwargs): diff --git a/testing/test_webdriver.py b/testing/test_webdriver.py index f2f483a..348a708 100644 --- a/testing/test_webdriver.py +++ b/testing/test_webdriver.py @@ -9,8 +9,7 @@ def test_event_listening_webdriver(testdir): - file_test = testdir.makepyfile( - """ + file_test = testdir.makepyfile(""" import pytest from selenium.webdriver.support.event_firing_webdriver import \ EventFiringWebDriver @@ -21,8 +20,7 @@ def test_selenium(base_url, selenium): with pytest.raises(Exception) as e: selenium.get(base_url) assert 'before_navigate_to' in e.exconly() - """ - ) + """) testdir.quick_qa( "--event-listener", "testing." "test_webdriver.ConcreteEventListener",