[Python-checkins] cpython (2.7): this was supposed to die

Tue Feb 21 04:33:47 CET 2012

http://hg.python.org/cpython/rev/e3fb353b3fd4
changeset: 75108:e3fb353b3fd4
branch: 2.7
parent: 75106:fca3b3936aee
user: Benjamin Peterson <benjamin at python.org>
date: Mon Feb 20 22:33:33 2012 -0500
summary:
 this was supposed to die
files:
 Lib/test/test_compiler.py | 4 ++--
 Lib/test/test_os.py | 14 --------------
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/Lib/test/test_compiler.py b/Lib/test/test_compiler.py
--- a/Lib/test/test_compiler.py
+++ b/Lib/test/test_compiler.py
@@ -28,8 +28,8 @@
 libdir = os.path.dirname(os.__file__)
 testdir = os.path.dirname(test.test_support.__file__)
 
- for dir in [libdir, testdir]:
- for basename in os.listdir(dir):
+ for dir in [testdir]:
+ for basename in "test_os.py",:
 # Print still working message since this test can be really slow
 if next_time <= time.time():
 next_time = time.time() + _PRINT_WORKING_MSG_INTERVAL
diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -527,19 +527,6 @@
 f.close()
 
 class URandomTests (unittest.TestCase):
- def test_urandom(self):
- try:
- self.assertEqual(len(os.urandom(1)), 1)
- self.assertEqual(len(os.urandom(10)), 10)
- self.assertEqual(len(os.urandom(100)), 100)
- self.assertEqual(len(os.urandom(1000)), 1000)
- # see http://bugs.python.org/issue3708
- self.assertRaises(TypeError, os.urandom, 0.9)
- self.assertRaises(TypeError, os.urandom, 1.1)
- self.assertRaises(TypeError, os.urandom, 2.0)
- self.assertEqual(len(os.urandom(0.9)), 0)
- self.assertEqual(len(os.urandom(1.1)), 1)
- self.assertEqual(len(os.urandom(2.0)), 2)
 
 def test_urandom_length(self):
 self.assertEqual(len(os.urandom(0)), 0)
@@ -571,7 +558,6 @@
 data1 = self.get_urandom_subprocess(16)
 data2 = self.get_urandom_subprocess(16)
 self.assertNotEqual(data1, data2)
->>>>>>> other
 
 def test_execvpe_with_bad_arglist(self):
 self.assertRaises(ValueError, os.execvpe, 'notepad', [], None)
-- 
Repository URL: http://hg.python.org/cpython
