merge

3 files changed, 11 insertions, 71 deletions

diff --git a/Lib/test/test_decimal.py b/Lib/test/test_decimal.py
index 286d82c0da0..694b959e218 100644
--- a/Lib/test/test_decimal.py
+++ b/Lib/test/test_decimal.py
@@ -56,76 +56,6 @@ sys.modules['decimal'] = C
 fractions = {C:cfractions, P:pfractions}
 sys.modules['decimal'] = orig_sys_decimal
 
-############ RunFirst ############
-class RunFirst(unittest.TestCase):
-
-    def setUp(self):
-        self.save_default = self.decimal.DefaultContext.copy()
-
-    def tearDown(self):
-        DefaultContext = self.decimal.DefaultContext
-
-        DefaultContext.prec = self.save_default.prec
-        DefaultContext.rounding = self.save_default.rounding
-        DefaultContext.Emax = self.save_default.Emax
-        DefaultContext.Emin = self.save_default.Emin
-        DefaultContext.capitals = self.save_default.capitals
-        DefaultContext.clamp = self.save_default.clamp
-        DefaultContext.flags = self.save_default.flags
-        DefaultContext.traps = self.save_default.traps
-
-        self.decimal.setcontext(self.decimal.DefaultContext)
-
-    def test_00default_context(self):
-        # The test depends on the fact that getcontext() is called
-        # for the first time.
-        DefaultContext = self.decimal.DefaultContext
-        ROUND_05UP = self.decimal.ROUND_05UP
-        Clamped = self.decimal.Clamped
-        InvalidOperation = self.decimal.InvalidOperation
-
-        DefaultContext.prec = 5001
-        DefaultContext.rounding = ROUND_05UP
-        DefaultContext.Emax = 10025
-        DefaultContext.Emin = -10025
-        DefaultContext.capitals = 0
-        DefaultContext.clamp = 1
-        DefaultContext.flags[InvalidOperation] = True
-        DefaultContext.clear_traps()
-        DefaultContext.traps[Clamped] = True
-
-        # implicit initialization on first access
-        c = self.decimal.getcontext()
-
-        self.assertEqual(c.prec, 5001)
-        self.assertEqual(c.rounding, ROUND_05UP)
-        self.assertEqual(c.Emax, 10025)
-        self.assertEqual(c.Emin, -10025)
-        self.assertEqual(c.capitals, 0)
-        self.assertEqual(c.clamp, 1)
-        for k in c.flags:
-            self.assertFalse(c.flags[k])
-        for k in c.traps:
-            if k is Clamped:
-                self.assertTrue(c.traps[k])
-            else:
-                self.assertFalse(c.traps[k])
-
-        # explicit initialization
-        self.decimal.setcontext(DefaultContext)
-        c = self.decimal.getcontext()
-        for k in c.flags:
-            self.assertFalse(c.flags[k])
-
-class CRunFirst(RunFirst):
-    decimal = C
-class PyRunFirst(RunFirst):
-    decimal = P
-if C:
-    run_unittest(CRunFirst, PyRunFirst)
-else:
-    run_unittest(PyRunFirst)
-############ END RunFirst ############
 
 # Useful Test Constant
 Signals = {
diff --git a/Lib/test/test_thread.py b/Lib/test/test_thread.py
index deb4bf36202..41fb3acd7b3 100644
--- a/Lib/test/test_thread.py
+++ b/Lib/test/test_thread.py
@@ -132,7 +132,6 @@ class ThreadRunningTests(BasicThreadTest):
         # See issue #14474
         def task():
             started.release()
-            sys.stderr = stderr
             raise SyntaxError
         def mywrite(self, *args):
             try:
diff --git a/Lib/test/test_time.py b/Lib/test/test_time.py
index 28d018afe7a..fb2489c4532 100644
--- a/Lib/test/test_time.py
+++ b/Lib/test/test_time.py
@@ -47,6 +47,17 @@ class TimeTestCase(unittest.TestCase):
         self.assertGreater(res, 0.0)
         self.assertLessEqual(res, 1.0)
 
+    @unittest.skipUnless(hasattr(time, 'clock_settime'),
+                         'need time.clock_settime()')
+    def test_clock_settime(self):
+        t = time.clock_gettime(time.CLOCK_REALTIME)
+        try:
+            time.clock_settime(time.CLOCK_REALTIME, t)
+        except PermissionError:
+            pass
+
+        self.assertRaises(OSError, time.clock_settime, time.CLOCK_MONOTONIC, 0)
+
     def test_conversions(self):
         self.assertEqual(time.ctime(self.t),
                          time.asctime(time.localtime(self.t)))