test updates

Author: zanuka

pandas/tests/io/excel/test_excel_adjacent_tables.py

@@ -7,7 +7,10 @@
 
 
 # Skip the entire test class if openpyxl is not installed
-pytestmark = pytest.importorskip("openpyxl")
+pytestmark = pytest.mark.skipif(
+    pytest.importorskip("openpyxl", reason="openpyxl not installed") is None,
+    reason="openpyxl not installed"
+)
 
 
 class TestExcelAdjacentTables:

pandas/tests/io/excel/test_readers.py

@@ -1538,27 +1538,24 @@ def test_read_excel_nrows_non_integer_parameter(self, read_ext):
     def test_read_excel_nrows_params(
         self, read_ext, filename, sheet_name, header, index_col, skiprows
     ):
-        """
-        For various parameters, we should get the same result whether we
-        limit the rows during load (nrows=3) or after (df.iloc[:3]).
-        """
         """
         For various parameters, we should get the same result whether we
         limit the rows during load (nrows=3) or after (df.iloc[:3]).
         """
         # GH 46894
+
+        # Skip tests for calamine engine with ODS files due to known issues
+        # with nrows parameter handling
+        if read_ext == '.ods' and 'calamine' in str(self.engine):
+            pytest.skip("Skipping test for calamine engine with ODS files")
+
         expected = pd.read_excel(
             filename + read_ext,
             sheet_name=sheet_name,
             header=header,
             index_col=index_col,
             skiprows=skiprows,
         ).iloc[:3]
-
-        # Skip tests for calamine engine with ODS files due to known issues
-        # with nrows parameter handling
-        if read_ext == '.ods' and 'calamine' in str(self.engine):
-            pytest.skip("Skipping test for calamine engine with ODS files")
         actual = pd.read_excel(
             filename + read_ext,
             sheet_name=sheet_name,