Skip to content

Commit 4c2c85a

Browse files
committed
Fixing ignore filter for e2e scenario tests to be skipped during redis-py unit/integration pipeline runs
1 parent 9fee5ca commit 4c2c85a

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

tasks.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,11 @@ def standalone_tests(
5858

5959
if uvloop:
6060
run(
61-
f"pytest {profile_arg} --protocol={protocol} {redis_mod_url} --ignore=scenario --cov=./ --cov-report=xml:coverage_resp{protocol}_uvloop.xml -m 'not onlycluster{extra_markers}' --uvloop --junit-xml=standalone-resp{protocol}-uvloop-results.xml"
61+
f"pytest {profile_arg} --protocol={protocol} {redis_mod_url} --ignore=tests/test_scenario --cov=./ --cov-report=xml:coverage_resp{protocol}_uvloop.xml -m 'not onlycluster{extra_markers}' --uvloop --junit-xml=standalone-resp{protocol}-uvloop-results.xml"
6262
)
6363
else:
6464
run(
65-
f"pytest {profile_arg} --protocol={protocol} {redis_mod_url} --ignore=scenario --cov=./ --cov-report=xml:coverage_resp{protocol}.xml -m 'not onlycluster{extra_markers}' --junit-xml=standalone-resp{protocol}-results.xml"
65+
f"pytest {profile_arg} --protocol={protocol} {redis_mod_url} --ignore=tests/test_scenario --cov=./ --cov-report=xml:coverage_resp{protocol}.xml -m 'not onlycluster{extra_markers}' --junit-xml=standalone-resp{protocol}-results.xml"
6666
)
6767

6868

@@ -74,11 +74,11 @@ def cluster_tests(c, uvloop=False, protocol=2, profile=False):
7474
cluster_tls_url = "rediss://localhost:27379/0"
7575
if uvloop:
7676
run(
77-
f"pytest {profile_arg} --protocol={protocol} --ignore=scenario --cov=./ --cov-report=xml:coverage_cluster_resp{protocol}_uvloop.xml -m 'not onlynoncluster and not redismod' --redis-url={cluster_url} --redis-ssl-url={cluster_tls_url} --junit-xml=cluster-resp{protocol}-uvloop-results.xml --uvloop"
77+
f"pytest {profile_arg} --protocol={protocol} --ignore=tests/test_scenario --cov=./ --cov-report=xml:coverage_cluster_resp{protocol}_uvloop.xml -m 'not onlynoncluster and not redismod' --redis-url={cluster_url} --redis-ssl-url={cluster_tls_url} --junit-xml=cluster-resp{protocol}-uvloop-results.xml --uvloop"
7878
)
7979
else:
8080
run(
81-
f"pytest {profile_arg} --protocol={protocol} --ignore=scenario --cov=./ --cov-report=xml:coverage_cluster_resp{protocol}.xml -m 'not onlynoncluster and not redismod' --redis-url={cluster_url} --redis-ssl-url={cluster_tls_url} --junit-xml=cluster-resp{protocol}-results.xml"
81+
f"pytest {profile_arg} --protocol={protocol} --ignore=tests/test_scenario --cov=./ --cov-report=xml:coverage_cluster_resp{protocol}.xml -m 'not onlynoncluster and not redismod' --redis-url={cluster_url} --redis-ssl-url={cluster_tls_url} --junit-xml=cluster-resp{protocol}-results.xml"
8282
)
8383

8484

tests/test_scenario/test_hitless_upgrade.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -537,9 +537,6 @@ def test_new_connection_handling_during_migrating_and_moving(
537537
ClientValidations.wait_push_notification(
538538
client, timeout=MIGRATE_TIMEOUT, connection=second_connection
539539
)
540-
# second_connection.send_command("PING")
541-
# resp = second_connection.read_response()
542-
# assert resp == b"PONG"
543540

544541
logging.info(
545542
"Validating connection states after MIGRATING for both connections ..."

0 commit comments

Comments
 (0)