[Python-checkins] r83658 - in python/branches/release26-maint/Lib/test: test_dl.py test_os.py

[ezio.melotti]

Author: ezio.melotti
Date: Tue Aug  3 12:44:09 2010
New Revision: 83658

Log:
Fix buildbot failure in test_os.py

Modified:
   python/branches/release26-maint/Lib/test/test_dl.py
   python/branches/release26-maint/Lib/test/test_os.py

Modified: python/branches/release26-maint/Lib/test/test_dl.py
==============================================================================
--- python/branches/release26-maint/Lib/test/test_dl.py	(original)
+++ python/branches/release26-maint/Lib/test/test_dl.py	Tue Aug  3 12:44:09 2010
@@ -3,7 +3,10 @@
    Roger E. Masse  revised strategy by Barry Warsaw
 """
 from test.test_support import verbose,TestSkipped, import_module
+import warnings
+warnings.simplefilter('always')
 dl = import_module('dl', deprecated=True)
+warnings.resetwarnings()
 
 sharedlibs = [
     ('/usr/lib/libc.so', 'getpid'),

Modified: python/branches/release26-maint/Lib/test/test_os.py
==============================================================================
--- python/branches/release26-maint/Lib/test/test_os.py	(original)
+++ python/branches/release26-maint/Lib/test/test_os.py	Tue Aug  3 12:44:09 2010
@@ -500,8 +500,7 @@
 class URandomTests (unittest.TestCase):
     def test_urandom(self):
         try:
-            with test_support._check_py3k_warnings(
-                ('integer argument expected, got float', DeprecationWarning)):
+            with test_support.check_warnings():
                 self.assertEqual(len(os.urandom(1)), 1)
                 self.assertEqual(len(os.urandom(10)), 10)
                 self.assertEqual(len(os.urandom(100)), 100)