Merge branch 'maint'

mpi4py · May 4, 2016 · 93fc356 · 93fc356
2 parents f30432b + 94a8631
commit 93fc356
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/test/test_file.py b/test/test_file.py
@@ -98,14 +98,18 @@ def testGetSetView(self):
                     self.FILE.Set_view(disp, etype, ftype,
                                        datarep, MPI.INFO_NULL)
                     of, et, ft, dr = self.FILE.Get_view()
-                    self.assertEqual(disp,    of)
-                    self.assertEqual(etype,   et)
-                    self.assertEqual(ftype,   ft)
+                    self.assertEqual(disp, of)
+                    self.assertEqual(etype.Get_extent(), et.Get_extent())
+                    self.assertEqual(ftype.Get_extent(), ft.Get_extent())
                     self.assertEqual(datarep, dr)
-                    #try: et.Free()
-                    #except MPI.Exception: pass
-                    #try: ft.Free()
-                    #except MPI.Exception: pass
+                    try:
+                        if not et.is_predefined: et.Free()
+                    except NotImplementedError:
+                        if et != etype: et.Free()
+                    try:
+                        if not ft.is_predefined: ft.Free()
+                    except NotImplementedError:
+                        if ft != ftype: ft.Free()
 
     def testGetSetAtomicity(self):
         atom = self.FILE.Get_atomicity()