diff --git a/cmdeploy/src/cmdeploy/cmdeploy.py b/cmdeploy/src/cmdeploy/cmdeploy.py index a92d8287..ebd05ce4 100644 --- a/cmdeploy/src/cmdeploy/cmdeploy.py +++ b/cmdeploy/src/cmdeploy/cmdeploy.py @@ -194,12 +194,6 @@ def status_cmd(args, out): def test_cmd_options(parser): - parser.add_argument( - "--slow", - dest="slow", - action="store_true", - help="also run slow tests", - ) add_ssh_host_option(parser) @@ -221,8 +215,6 @@ def test_cmd(args, out): "-v", "--durations=5", ] - if args.slow: - pytest_args.append("--slow") ret = out.run_ret(pytest_args, env=env) return ret diff --git a/cmdeploy/src/cmdeploy/tests/online/test_1_basic.py b/cmdeploy/src/cmdeploy/tests/online/test_1_basic.py index 1a3fa43a..5f9623df 100644 --- a/cmdeploy/src/cmdeploy/tests/online/test_1_basic.py +++ b/cmdeploy/src/cmdeploy/tests/online/test_1_basic.py @@ -221,7 +221,6 @@ def test_rewrite_subject(cmsetup, maildata): assert "Subject: Unencrypted subject" not in rcvd_msg -@pytest.mark.slow def test_exceed_rate_limit(cmsetup, gencreds, maildata, chatmail_config): """Test that the per-account send-mail limit is exceeded.""" user1, user2 = cmsetup.gen_users(2) @@ -244,7 +243,6 @@ def test_exceed_rate_limit(cmsetup, gencreds, maildata, chatmail_config): pytest.fail("Rate limit was not exceeded") -@pytest.mark.slow def test_expunged(remote, chatmail_config): outdated_days = int(chatmail_config.delete_mails_after) + 1 find_cmds = [ diff --git a/cmdeploy/src/cmdeploy/tests/plugin.py b/cmdeploy/src/cmdeploy/tests/plugin.py index afa32fcb..fc5e2f26 100644 --- a/cmdeploy/src/cmdeploy/tests/plugin.py +++ b/cmdeploy/src/cmdeploy/tests/plugin.py @@ -23,12 +23,6 @@ def _is_ip(domain): return False -def pytest_addoption(parser): - parser.addoption( - "--slow", action="store_true", default=False, help="also run slow tests" - ) - - def pytest_configure(config): config._benchresults = {} config.addinivalue_line( @@ -36,13 +30,6 @@ def pytest_configure(config): ) -def pytest_runtest_setup(item): - markers = list(item.iter_markers(name="slow")) - if markers: - if not item.config.getoption("--slow"): - pytest.skip("skipping slow test, use --slow to run") - - def _get_chatmail_config(): inipath = os.environ.get("CHATMAIL_INI") if inipath: