[impala] 03/03: IMPALA-11578: Exclude locality test for remote FS

[jo...@apache.org]

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

commit 19114c7205318e8df158348a02695c378df1abe6
Author: Michael Smith <mi...@cloudera.com>
AuthorDate: Tue Sep 13 11:13:38 2022 -0700

    IMPALA-11578: Exclude locality test for remote FS
    
    Exclude test_scheduler_locality when the filesystem can only be remote.
    
    Change-Id: Ie6198421f21bc2520773ecbb34ffaf65969ebc43
    Reviewed-on: http://gerrit.cloudera.org:8080/18980
    Reviewed-by: Wenzhe Zhou <wz...@cloudera.com>
    Tested-by: Impala Public Jenkins <im...@cloudera.com>
---
 tests/common/skip.py                            | 4 ++++
 tests/custom_cluster/test_scheduler_locality.py | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/tests/common/skip.py b/tests/common/skip.py
index 8f380419f..055030a43 100644
--- a/tests/common/skip.py
+++ b/tests/common/skip.py
@@ -50,6 +50,10 @@ class SkipIfFS:
       reason="HDFS encryption is not supported")
   hdfs_block_size = pytest.mark.skipif(not IS_HDFS, reason="uses it's own block size")
   hdfs_acls = pytest.mark.skipif(not IS_HDFS, reason="HDFS acls are not supported")
+  # TODO: IMPALA-11584: see if this can be collapsed into SkipIfNotHdfsMinicluster
+  always_remote = pytest.mark.skipif(IS_EC or not (IS_HDFS or IS_OZONE)
+      or IMPALA_TEST_CLUSTER_PROPERTIES.is_remote_cluster(),
+      reason="Only HDFS and Ozone tests are run co-located")
 
   # Special case product limitations.
   empty_directory = pytest.mark.skipif(IS_S3,
diff --git a/tests/custom_cluster/test_scheduler_locality.py b/tests/custom_cluster/test_scheduler_locality.py
index bccbcfa82..0ab1dc301 100644
--- a/tests/custom_cluster/test_scheduler_locality.py
+++ b/tests/custom_cluster/test_scheduler_locality.py
@@ -19,12 +19,14 @@
 
 from tests.common.custom_cluster_test_suite import CustomClusterTestSuite
 from tests.common.network import get_external_ip
+from tests.common.skip import SkipIfFS
 
 
 LOCAL_ASSIGNMENTS_METRIC = "simple-scheduler.local-assignments.total"
 TOTAL_ASSIGNMENTS_METRIC = "simple-scheduler.assignments.total"
 
 
+@SkipIfFS.always_remote
 class TestSchedulerLocality(CustomClusterTestSuite):
   """Tests for local and remote disk scheduling."""