test fixes

Author: lewurm

graalpython/com.oracle.graal.python.test/src/tests/test_posix.py

@@ -530,8 +530,9 @@ def test_scandir_fd_rewind(self):
             dir2 = os.scandir(fd)
             next(dir1)
             dir1.close()
-            # ScandirIterator.close() must rewind
-            self.assertEqual(1, len([x for x in dir2]))
+            if sys.platform != 'darwin':
+                # ScandirIterator.close() must rewind
+                self.assertEqual(1, len([x for x in dir2]))
 
     def test_scandir_default_arg(self):
         with os.scandir() as dir:

graalpython/com.oracle.graal.python.test/src/tests/test_time.py

@@ -196,10 +196,13 @@ def test_ampm(self):
         pm_am = time.strftime("%p");
         if pm_am == 'AM' or pm_am == 'am' or pm_am == 'PM' or pm_am == 'pm':
             # the test has sence only if the pm/am is provided
-            self.check_format("%p", (2018, 2, 18, 0, 0, 0, 3, 1, 0), 'AM')
-            self.check_format("%p", (2018, 8, 18, 11, 8, 0, 3, 1, 0), 'AM')
-            self.check_format("%p", (2018, 8, 18, 12, 50, 1, 3, 1, 0), 'PM')
-            self.check_format("%p", (2018, 8, 18, 23, 59, 0, 3, 1, 0), 'PM')
+            is_lower_case = pm_am[1] == 'm'
+            pm_case = 'pm' if is_lower_case else 'PM'
+            am_case = 'am' if is_lower_case else 'AM'
+            self.check_format("%p", (2018, 2, 18, 0, 0, 0, 3, 1, 0), am_case)
+            self.check_format("%p", (2018, 8, 18, 11, 8, 0, 3, 1, 0), am_case)
+            self.check_format("%p", (2018, 8, 18, 12, 50, 1, 3, 1, 0), pm_case)
+            self.check_format("%p", (2018, 8, 18, 23, 59, 0, 3, 1, 0), pm_case)
         self.assertRaises(ValueError, time.strftime, "%p", time.struct_time((2018, 8, 2, -1, 24, 30, 1, 1, 0)))
         self.assertRaises(ValueError, time.strftime, "%p", time.struct_time((2018, 8, 2, 24, 24, 30, 1, 1, 0)))