Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion docker/env/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.107-PR13751-82c347a
1.108-PR15694-82b64e2
1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ dependencies = [
"PyGithub==2.1.1",
"pytest-random-order==1.0.4",
"pytest-subtests==0.14.2",
"pytest-xdist==3.8.0",
"pytest==8.3.4",
"python-jenkins==1.8.2",
"PyYAML==6.0.1",
Expand Down
15 changes: 13 additions & 2 deletions sct.py
Original file line number Diff line number Diff line change
Expand Up @@ -1631,8 +1631,9 @@ def unit_tests(test, junit_xml):

@cli.command("integration-tests", help="Run all the SCT internal integration-tests")
@click.option("-t", "--test", required=False, default="", help="Run specific test file from unit-tests directory")
@click.option("-n", required=False, default=4, help="Sets number of parallel tests to run, default is 4")
@click.option("--junit-xml", required=False, default="", help="Path to write JUnit XML report")
def integration_tests(test, junit_xml):
def integration_tests(test, n, junit_xml):
get_test_config().logdir()
add_file_logger()

Expand All @@ -1648,7 +1649,17 @@ def integration_tests(test, junit_xml):
)
local_cluster.setup_prerequisites()

args = ["-v", "-p", "no:warnings", "-m", "integration", "unit_tests/{}".format(test)]
args = [
"-v",
"-p",
"no:warnings",
"-m",
"integration",
"--dist",
"loadgroup",
f"-n{n}",
"unit_tests/{}".format(test),
]
if junit_xml:
args.append(f"--junit-xml={junit_xml}")
sys.exit(pytest.main(args))
Expand Down
1 change: 1 addition & 0 deletions unit_tests/test_cassandra_stress_thread.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
pytestmark = [
pytest.mark.usefixtures("events"),
pytest.mark.integration,
pytest.mark.xdist_group("docker_ssl"),
]


Expand Down
1 change: 1 addition & 0 deletions unit_tests/test_cql_stress_cassandra_stress_thread.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
pytestmark = [
pytest.mark.usefixtures("events"),
pytest.mark.integration,
pytest.mark.xdist_group("docker_heavy"),
]


Expand Down
1 change: 1 addition & 0 deletions unit_tests/test_gemini_thread.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
pytestmark = [
pytest.mark.usefixtures("events"),
pytest.mark.integration,
pytest.mark.xdist_group("docker_heavy"),
]


Expand Down
1 change: 1 addition & 0 deletions unit_tests/test_kafka.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@

pytestmark = [
pytest.mark.integration,
pytest.mark.xdist_group("docker_heavy"),
]

LOGGER = logging.getLogger(__name__)
Expand Down
4 changes: 4 additions & 0 deletions unit_tests/test_latte_thread.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@


@pytest.mark.integration
@pytest.mark.xdist_group("docker_ssl")
def test_01_latte_schema(request, docker_scylla, params):
params["enable_argus"] = False
loader_set = LocalLoaderSetDummy(params=params)
Expand All @@ -50,6 +51,7 @@ def cleanup_thread():


@pytest.mark.integration
@pytest.mark.xdist_group("docker_ssl")
def test_02_latte_load(request, docker_scylla, params):
params["enable_argus"] = False
loader_set = LocalLoaderSetDummy(params=params)
Expand All @@ -69,6 +71,7 @@ def cleanup_thread():


@pytest.mark.integration
@pytest.mark.xdist_group("docker_ssl")
def test_03_latte_run(request, docker_scylla, prom_address, params):
params["enable_argus"] = False
loader_set = LocalLoaderSetDummy(params=params)
Expand Down Expand Up @@ -107,6 +110,7 @@ def check_metrics():


@pytest.mark.integration
@pytest.mark.xdist_group("docker_ssl")
@pytest.mark.docker_scylla_args(ssl=True)
def test_04_latte_run_client_encrypt(request, docker_scylla, params):
params["client_encrypt"] = True
Expand Down
1 change: 1 addition & 0 deletions unit_tests/test_ndbench_thread.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
pytestmark = [
pytest.mark.usefixtures("events"),
pytest.mark.integration,
pytest.mark.xdist_group("docker_heavy"),
]


Expand Down
4 changes: 4 additions & 0 deletions unit_tests/test_python_driver.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@

log = logging.getLogger(__name__)

pytestmark = [
pytest.mark.xdist_group("docker_ssl"),
]


@pytest.mark.integration
@pytest.mark.parametrize(
Expand Down
1 change: 1 addition & 0 deletions unit_tests/test_run_cqlsh.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

pytestmark = [
pytest.mark.integration,
pytest.mark.xdist_group("docker_heavy"),
]


Expand Down
1 change: 1 addition & 0 deletions unit_tests/test_scylla_bench_thread.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@


@pytest.mark.integration
@pytest.mark.xdist_group("docker_ssl")
@pytest.mark.parametrize(
"extra_cmd",
argvalues=[
Expand Down
1 change: 1 addition & 0 deletions unit_tests/test_vector_store.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
scylla_docker_image="scylladb/scylla-nightly:2025.4.0-dev-0.20250811.e14c5e3890de",
vs_docker_image="scylladb/vector-store:latest",
),
pytest.mark.xdist_group("docker_heavy"),
]

LOGGER = logging.getLogger(__name__)
Expand Down
1 change: 1 addition & 0 deletions unit_tests/test_ycsb_thread.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
pytestmark = [
pytest.mark.usefixtures("events"),
pytest.mark.integration,
pytest.mark.xdist_group("docker_heavy"),
]


Expand Down