summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2012-02-21 03:33:33 (GMT)
committerBenjamin Peterson <benjamin@python.org>2012-02-21 03:33:33 (GMT)
commit72949bd511be40a6cc24cf9124bd8d798a48d7bb (patch)
treeb931631f84f6b74bdacf712420b243888f1213f5 /Lib
parent50376771707836dd7294c8071a6633e551ec5966 (diff)
downloadcpython-72949bd511be40a6cc24cf9124bd8d798a48d7bb.zip
cpython-72949bd511be40a6cc24cf9124bd8d798a48d7bb.tar.gz
cpython-72949bd511be40a6cc24cf9124bd8d798a48d7bb.tar.bz2
this was supposed to die
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_compiler.py4
-rw-r--r--Lib/test/test_os.py14
2 files changed, 2 insertions, 16 deletions
diff --git a/Lib/test/test_compiler.py b/Lib/test/test_compiler.py
index 332e0bb..4598811 100644
--- a/Lib/test/test_compiler.py
+++ b/Lib/test/test_compiler.py
@@ -28,8 +28,8 @@ class CompilerTest(unittest.TestCase):
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
index d52b784..1268fa3 100644
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -527,19 +527,6 @@ class DevNullTests (unittest.TestCase):
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 @@ class URandomTests (unittest.TestCase):
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)