[impala] 02/05: IMPALA-11464: (Addendum) Skip tests in Ozone

[bo...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

boroknagyz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/impala.git

commit cf7490ccbdd8ce3ced2a3ae35974de6a7ef91db9
Author: Michael Smith <mi...@cloudera.com>
AuthorDate: Wed Aug 31 10:16:27 2022 -0700

    IMPALA-11464: (Addendum) Skip tests in Ozone
    
    Updates the skip for new recursive listing tests to match the comment so
    that they're only run on HDFS. The previous skip only roughly matched
    the set of all non-HDFS filesystems, and didn't automatically include
    new filesystems.
    
    Change-Id: I80de83d506138b57a969258b2f6dcf112dd2e44d
    Reviewed-on: http://gerrit.cloudera.org:8080/18934
    Reviewed-by: Impala Public Jenkins <im...@cloudera.com>
    Tested-by: Impala Public Jenkins <im...@cloudera.com>
---
 tests/common/skip.py                     | 2 ++
 tests/metadata/test_recursive_listing.py | 7 +++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/tests/common/skip.py b/tests/common/skip.py
index 70bb0717b..1b4b86643 100644
--- a/tests/common/skip.py
+++ b/tests/common/skip.py
@@ -72,6 +72,8 @@ class SkipIfFS:
   hbase = pytest.mark.skipif(not IS_HDFS, reason="HBase not started")
   qualified_path = pytest.mark.skipif(not IS_HDFS,
       reason="Tests rely on HDFS qualified paths, IMPALA-1872")
+  no_partial_listing = pytest.mark.skipif(not IS_HDFS,
+      reason="Tests rely on HDFS partial listing.")
   variable_listing_times = pytest.mark.skipif(IS_S3 or IS_GCS or IS_COS,
       reason="Flakiness due to unpredictable listing times on S3.")
   eventually_consistent = pytest.mark.skipif(IS_ADLS or IS_COS,
diff --git a/tests/metadata/test_recursive_listing.py b/tests/metadata/test_recursive_listing.py
index 321b78a2d..7b8b0d14b 100644
--- a/tests/metadata/test_recursive_listing.py
+++ b/tests/metadata/test_recursive_listing.py
@@ -141,8 +141,7 @@ class TestRecursiveListing(ImpalaTestSuite):
     assert len(self._show_files(fq_tbl_name)) == 1
     assert len(self._get_rows(fq_tbl_name)) == 1
 
-  @SkipIfFS.variable_listing_times
-  @SkipIfFS.eventually_consistent
+  @SkipIfFS.no_partial_listing
   @pytest.mark.execute_serially
   @pytest.mark.stress
   def test_large_staging_dirs(self, unique_database):
@@ -166,8 +165,7 @@ class TestRecursiveListing(ImpalaTestSuite):
                                  pause_ms_before_file_cleanup=300,
                                  refresh_should_fail=False)
 
-  @SkipIfFS.variable_listing_times
-  @SkipIfFS.eventually_consistent
+  @SkipIfFS.no_partial_listing
   @pytest.mark.execute_serially
   @pytest.mark.stress
   def test_partition_dir_removed_inflight(self, unique_database):
@@ -213,6 +211,7 @@ class TestRecursiveListing(ImpalaTestSuite):
       handle = self.execute_query_async(refresh_stmt)
       # Wait a moment to let REFRESH finish expected partial listing on the dir.
       time.sleep(pause_ms_before_file_cleanup / 1000.0)
+      LOG.info("removing staging dir " + large_dir)
       self.filesystem_client.delete_file_dir(large_dir[1:], recursive=True)
       LOG.info("removed staging dir " + large_dir)
       try: