Commits

Brian Kearns committed 8009844 Merge

merge default

Comments (0)

Files changed (9)

lib-python/conftest.py

                                  usemodules = '',
                                  skip=None): 
         self.basename = basename 
-        self._usemodules = usemodules.split() + ['signal', '_warnings']
+        self._usemodules = usemodules.split() + ['signal', 'rctime', 'binascii', '_socket',
+                'select', 'fcntl', '_posixsubprocess']
         self._compiler = compiler 
         self.core = core
         self.skip = skip
 testmap = [
     RegrTest('test___all__.py', core=True),
     RegrTest('test___future__.py', core=True),
-    RegrTest('test__locale.py', skip=skip_win32),
+    RegrTest('test__locale.py', usemodules='_locale', skip=skip_win32),
     RegrTest('test_abc.py'),
     RegrTest('test_abstract_numbers.py'),
     RegrTest('test_aifc.py'),
-    RegrTest('test_argparse.py'),
-    RegrTest('test_array.py', core=True, usemodules='struct array'),
-    RegrTest('test_ast.py', core=True),
-    RegrTest('test_asynchat.py', usemodules='thread'),
-    RegrTest('test_asyncore.py'),
+    RegrTest('test_argparse.py', usemodules='binascii'),
+    RegrTest('test_array.py', core=True, usemodules='struct array binascii'),
+    RegrTest('test_ast.py', core=True, usemodules='struct'),
+    RegrTest('test_asynchat.py', usemodules='select fcntl'),
+    RegrTest('test_asyncore.py', usemodules='select fcntl'),
     RegrTest('test_atexit.py', core=True),
     RegrTest('test_audioop.py', skip=True),
     RegrTest('test_augassign.py', core=True),
-    RegrTest('test_base64.py'),
+    RegrTest('test_base64.py', usemodules='struct'),
     RegrTest('test_bigaddrspace.py'),
     RegrTest('test_bigmem.py'),
     RegrTest('test_binascii.py', usemodules='binascii'),
     RegrTest('test_bisect.py', core=True, usemodules='_bisect'),
     RegrTest('test_bool.py', core=True),
     RegrTest('test_bufio.py', core=True),
-    RegrTest('test_builtin.py', core=True),
-    RegrTest('test_bytes.py'),
+    RegrTest('test_builtin.py', core=True, usemodules='binascii'),
+    RegrTest('test_bytes.py', usemodules='struct binascii'),
     RegrTest('test_bz2.py', usemodules='bz2'),
     RegrTest('test_calendar.py'),
     RegrTest('test_call.py', core=True),
     RegrTest('test_sort.py', core=True),
     RegrTest('test_sqlite.py', usemodules="thread _rawffi zlib"),
     RegrTest('test_ssl.py', usemodules='_ssl _socket select'),
-    RegrTest('test_startfile.py'), # skip="bogus test"?
+    RegrTest('test_startfile.py'),
     RegrTest('test_strftime.py'),
     RegrTest('test_string.py', core=True),
     RegrTest('test_stringprep.py'),
 
 def check_testmap_complete():
     listed_names = dict.fromkeys([regrtest.basename for regrtest in testmap])
+    assert len(listed_names) == len(testmap)
     listed_names['test_support.py'] = True     # ignore this
     missing = []
     for path in testdir.listdir(fil='test_*.py'):
     def getinvocation(self, regrtest): 
         fspath = regrtest.getfspath() 
         python = sys.executable 
-        pypy_script = pypydir.join('bin', 'py.py')
+        pypy_script = pypydir.join('bin', 'pyinteractive.py')
         alarm_script = pypydir.join('tool', 'alarm.py')
         if sys.platform == 'win32':
             watchdog_name = 'watchdog_nt.py'
Add a comment to this file

pypy/doc/test/test_whatsnew.py

File contents unchanged.

pypy/module/_multiprocessing/test/test_connection.py

         assert rhandle.readable
 
 class AppTestWinpipeConnection(BaseConnectionTest):
-    spaceconfig = dict(usemodules=('_multiprocessing', 'thread'))
+    spaceconfig = dict(usemodules=('_multiprocessing', 'thread', 'signal'))
 
     def setup_class(cls):
         if sys.platform != "win32":

pypy/module/crypt/test/test_crypt.py

+import os
+import py
+
+if os.name != 'posix':
+    py.test.skip('crypt module only available on unix')
+
 class AppTestCrypt: 
     spaceconfig = dict(usemodules=['crypt'])
- 
+
     def test_crypt(self):
         import crypt 
         res = crypt.crypt("pass", "ab")

pypy/module/fcntl/test/test_fcntl.py

 import os
+import py
 from rpython.tool.udir import udir
 
-if os.name == "nt":
-    from py.test import skip
-    skip("fcntl module is not available on Windows")
+if os.name != 'posix':
+    py.test.skip("fcntl module only available on unix")
 
 def teardown_module(mod):
     for i in "abcde":

pypy/module/posix/test/test_posix2.py

 
     if hasattr(os, 'chmod'):
         def test_chmod(self):
+            import sys
             os = self.posix
             os.unlink(self.path)
             raises(OSError, os.chmod, self.path, 0o600)
             f = open(self.path, "w")
             f.write("this is a test")
             f.close()
-            os.chmod(self.path, 0o200)
-            assert (os.stat(self.path).st_mode & 0o777) == 0o200
+            if sys.platform == 'win32':
+                os.chmod(self.path, 0o400)
+                assert (os.stat(self.path).st_mode & 0o600) == 0o400
+            else:
+                os.chmod(self.path, 0o200)
+                assert (os.stat(self.path).st_mode & 0o777) == 0o200
 
     if hasattr(os, 'fchmod'):
         def test_fchmod(self):

pypy/module/pwd/test/test_pwd.py

+import os
+import py
+
+if os.name != 'posix':
+    py.test.skip('pwd module only available on unix')
+
 class AppTestPwd:
     spaceconfig = dict(usemodules=['pwd'])
 

pypy/module/termios/test/test_termios.py

-
+import os
+import sys
 import py
-import sys
 from pypy.conftest import pypydir
 from rpython.tool.udir import udir
 
+if os.name != 'posix':
+    py.test.skip('termios module only available on unix')
+
 class TestTermios(object):
     def setup_class(cls):
         try:
Add a comment to this file

pypy/tool/clean_old_branches.py

File contents unchanged.

Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.