added tests for ods multi-sheet case

Author: davidovitch

pandas/io/tests/test_excel.py

@@ -88,6 +88,7 @@ def setUp(self):
         self.xls1 = os.path.join(self.dirpath, 'test.xls')
         self.xlsx1 = os.path.join(self.dirpath, 'test.xlsx')
         self.multisheet = os.path.join(self.dirpath, 'test_multisheet.xlsx')
+        self.multi_ods = os.path.join(self.dirpath, 'test_multisheet.ods')
         self.ods1 = os.path.join(self.dirpath, 'test.ods')
         self.frame = _frame.copy()
         self.frame2 = _frame2.copy()
@@ -460,59 +461,63 @@ def test_reader_converters(self):
         for path in (xls_path, xlsx_path, ods_path):
             actual = read_excel(path, 'Sheet1', converters=converters)
             tm.assert_frame_equal(actual, expected)
-    
+
     def test_reading_all_sheets(self):
         # Test reading all sheetnames by setting sheetname to None,
         # Ensure a dict is returned.
         # See PR #9450
-    
+
         _skip_if_no_xlrd()
-        
-        dfs = read_excel(self.multisheet,sheetname=None)
-        expected_keys = ['Alpha','Beta','Charlie']
-        tm.assert_contains_all(expected_keys,dfs.keys())
+        _skip_if_no_ezodf()
+
+        for multi in [self.multisheet, self.multi_ods]:
+            dfs = read_excel(multi, sheetname=None)
+            expected_keys = ['Alpha', 'Beta', 'Charlie']
+            tm.assert_contains_all(expected_keys, dfs.keys())
 
     def test_reading_multiple_specific_sheets(self):
-        # Test reading specific sheetnames by specifying a mixed list 
+        # Test reading specific sheetnames by specifying a mixed list
         # of integers and strings, and confirm that duplicated sheet
         # references (positions/names) are removed properly.
-        
+
         # Ensure a dict is returned
         # See PR #9450
         _skip_if_no_xlrd()
-        
-        #Explicitly request duplicates.  Only the set should be returned.
-        expected_keys = [2,'Charlie','Charlie']
-        dfs = read_excel(self.multisheet,sheetname=expected_keys)
-        expected_keys = list(set(expected_keys))
-        tm.assert_contains_all(expected_keys,dfs.keys())
-        assert len(expected_keys) == len(dfs.keys())
+        _skip_if_no_ezodf()
+
+        # Explicitly request duplicates. Only the set should be returned.
+        for multi in [self.multisheet, self.multi_ods]:
+            expected_keys = [2, 'Charlie', 'Charlie']
+            dfs = read_excel(multi, sheetname=expected_keys)
+            expected_keys = list(set(expected_keys))
+            tm.assert_contains_all(expected_keys, dfs.keys())
+            assert len(expected_keys) == len(dfs.keys())
 
     def test_creating_and_reading_multiple_sheets(self):
         # Test reading multiple sheets, from a runtime created excel file
         # with multiple sheets.
-         # See PR #9450       
-    
+        # See PR #9450
+
         _skip_if_no_xlrd()
         _skip_if_no_xlwt()
-               
+
         def tdf(sheetname):
             d, i = [11,22,33], [1,2,3]
             return DataFrame(d,i,columns=[sheetname])
-        
+
         sheets = ['AAA','BBB','CCC']
-        
+
         dfs = [tdf(s) for s in sheets]
         dfs = dict(zip(sheets,dfs))
-  
+
         with ensure_clean('.xlsx') as pth:
             with ExcelWriter(pth) as ew:
                 for sheetname, df in dfs.iteritems():
                     df.to_excel(ew,sheetname)
             dfs_returned = pd.read_excel(pth,sheetname=sheets)
             for s in sheets:
                 tm.assert_frame_equal(dfs[s],dfs_returned[s])
-    
+
     def test_reader_seconds(self):
         # Test reading times with and without milliseconds. GH5945.
         _skip_if_no_xlrd()