This is an automated email from the ASF dual-hosted git repository.
joemcdonnell pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/impala.git
The following commit(s) were added to refs/heads/master by this push:
new f4a4162b0 IMPALA-12442: Remove execute_serially from stress tests
f4a4162b0 is described below
commit f4a4162b054ce912e19692fbed125202a797b3d0
Author: Michael Smith <michael.sm...@cloudera.com>
AuthorDate: Tue Aug 22 10:58:30 2023 -0700
IMPALA-12442: Remove execute_serially from stress tests
Avoids labeling stress tests with execute_serially so they're only run
once during run-all-tests. Previously stress tests would be run twice,
once for 'execute_serially' and again for 'stress'.
Documents the markers in pytest.ini.
Change-Id: I49bfd745881da992815292d16e1a311ab1884abf
Reviewed-on: http://gerrit.cloudera.org:8080/20395
Reviewed-by: Impala Public Jenkins <impala-public-jenk...@cloudera.com>
Tested-by: Impala Public Jenkins <impala-public-jenk...@cloudera.com>
---
tests/metadata/test_recursive_listing.py | 2 --
tests/pytest.ini | 3 +++
tests/run-tests.py | 2 +-
tests/stress/test_acid_stress.py | 5 -----
tests/stress/test_insert_stress.py | 2 --
5 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/tests/metadata/test_recursive_listing.py
b/tests/metadata/test_recursive_listing.py
index de6cfc91d..631f6439d 100644
--- a/tests/metadata/test_recursive_listing.py
+++ b/tests/metadata/test_recursive_listing.py
@@ -140,7 +140,6 @@ class TestRecursiveListing(ImpalaTestSuite):
assert len(self._get_rows(fq_tbl_name)) == 1
@SkipIfFS.no_partial_listing
- @pytest.mark.execute_serially
@pytest.mark.stress
def test_large_staging_dirs(self, unique_database):
"""Regression test for IMPALA-11464:
@@ -164,7 +163,6 @@ class TestRecursiveListing(ImpalaTestSuite):
refresh_should_fail=False)
@SkipIfFS.no_partial_listing
- @pytest.mark.execute_serially
@pytest.mark.stress
def test_partition_dir_removed_inflight(self, unique_database):
"""Test REFRESH with concurrent add/remove ops on large partition dirs
diff --git a/tests/pytest.ini b/tests/pytest.ini
index 70838a854..fea3399fc 100644
--- a/tests/pytest.ini
+++ b/tests/pytest.ini
@@ -1,2 +1,5 @@
[pytest]
addopts = -r xfE -v --tb=short --showlocals
+markers =
+ execute_serially: tests that must not be executed in parallel
+ stress: stress tests, will be run independent of other tests
diff --git a/tests/run-tests.py b/tests/run-tests.py
index 166adc11b..dce1eec6b 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -311,7 +311,7 @@ if __name__ == "__main__":
run(base_args + build_test_args("serial{0}".format(shard_identifier)))
print_metrics('connections')
- # Run the stress tests tests
+ # Run the stress tests
if not skip_stress:
base_args = ['-m', 'stress', '-n', NUM_STRESS_CLIENTS]
run(base_args + build_test_args("stress{0}".format(shard_identifier)))
diff --git a/tests/stress/test_acid_stress.py b/tests/stress/test_acid_stress.py
index c4dee98b9..c3f8dc295 100644
--- a/tests/stress/test_acid_stress.py
+++ b/tests/stress/test_acid_stress.py
@@ -164,7 +164,6 @@ class TestAcidInsertsBasic(TestAcidStress):
@SkipIfHive2.acid
@SkipIfFS.hive
- @pytest.mark.execute_serially
@pytest.mark.stress
def test_read_hive_inserts(self, unique_database):
"""Check that Impala can read partitioned and non-partitioned ACID tables
@@ -173,7 +172,6 @@ class TestAcidInsertsBasic(TestAcidStress):
self._run_test_read_hive_inserts(unique_database, is_partitioned)
@SkipIfHive2.acid
- @pytest.mark.execute_serially
@pytest.mark.stress
def test_read_impala_inserts(self, unique_database):
"""Check that Impala can read partitioned and non-partitioned ACID tables
@@ -192,7 +190,6 @@ class TestAcidInsertsBasic(TestAcidStress):
finally:
impalad_client.close()
- @pytest.mark.execute_serially
@pytest.mark.stress
@SkipIf.not_dfs
@UniqueDatabase.parametrize(sync_ddl=True)
@@ -284,7 +281,6 @@ class TestConcurrentAcidInserts(TestAcidStress):
@SkipIfFS.stress_insert_timeouts
@SkipIfHive2.acid
@SkipIfDockerizedCluster.jira(reason="IMPALA-11189")
- @pytest.mark.execute_serially
@pytest.mark.stress
@UniqueDatabase.parametrize(sync_ddl=True)
def test_concurrent_inserts(self, unique_database):
@@ -383,7 +379,6 @@ class TestFailingAcidInserts(TestAcidStress):
@SkipIfFS.stress_insert_timeouts
@SkipIfDockerizedCluster.jira(reason="IMPALA-11191")
@SkipIfHive2.acid
- @pytest.mark.execute_serially
@pytest.mark.stress
@UniqueDatabase.parametrize(sync_ddl=True)
def test_failing_inserts(self, unique_database):
diff --git a/tests/stress/test_insert_stress.py
b/tests/stress/test_insert_stress.py
index 81611e5a5..85e7c8a38 100644
--- a/tests/stress/test_insert_stress.py
+++ b/tests/stress/test_insert_stress.py
@@ -82,7 +82,6 @@ class TestInsertStress(ImpalaTestSuite):
finally:
impalad_client.close()
- @pytest.mark.execute_serially
@pytest.mark.stress
@UniqueDatabase.parametrize(sync_ddl=True)
def test_inserts(self, unique_database):
@@ -105,7 +104,6 @@ class TestInsertStress(ImpalaTestSuite):
for i in range(0, num_checkers)]
run_tasks(writers + checkers)
- @pytest.mark.execute_serially
@pytest.mark.stress
@SkipIf.not_dfs
@UniqueDatabase.parametrize(sync_ddl=True)
