[pypy-commit] pypy default: Merged in bdkearns/pypy (pull request #100: replace some obsolete use of time with rctime, more test_ioctl fixes):

[arigo]

Author: arigo <armin.rigo at gmail.com>
Branch: 
Changeset: r59518:ee26ba2c1135
Date: 2012-12-20 11:05 +0100
http://bitbucket.org/pypy/pypy/changeset/ee26ba2c1135/

Log:	Merged in bdkearns/pypy (pull request #100: replace some obsolete
	use of time with rctime, more test_ioctl fixes):

	The changes from 'time' to 'rctime' are not really needed (since
	cc03c3f718b4), but don't hurt and are a step towards killing
	pypy/module/time.

diff --git a/pypy/module/fcntl/test/test_fcntl.py b/pypy/module/fcntl/test/test_fcntl.py
--- a/pypy/module/fcntl/test/test_fcntl.py
+++ b/pypy/module/fcntl/test/test_fcntl.py
@@ -11,7 +11,7 @@
             os.unlink(i)
 
 class AppTestFcntl:
-    spaceconfig = dict(usemodules=('fcntl', 'array', 'struct', 'termios', 'select', 'time'))
+    spaceconfig = dict(usemodules=('fcntl', 'array', 'struct', 'termios', 'select', 'rctime'))
     def setup_class(cls):
         tmpprefix = str(udir.ensure('test_fcntl', dir=1).join('tmp_'))
         cls.w_tmp = cls.space.wrap(tmpprefix)
@@ -191,8 +191,11 @@
         if child_pid == 0:
             # We're the child
             time.sleep(1)
-            return
+            os._exit(0)
         try:
+            # We're the parent, we want TIOCGPGRP calls after child started but before it dies
+            time.sleep(0)
+
             buf = array.array('i', [0])
             res = fcntl.ioctl(mfd, TIOCGPGRP, buf, True)
             assert res == 0
diff --git a/pypy/module/imp/test/test_import.py b/pypy/module/imp/test/test_import.py
--- a/pypy/module/imp/test/test_import.py
+++ b/pypy/module/imp/test/test_import.py
@@ -1268,7 +1268,7 @@
 
 
 class AppTestMultithreadedImp(object):
-    spaceconfig = dict(usemodules=['thread', 'time'])
+    spaceconfig = dict(usemodules=['thread', 'rctime'])
 
     def setup_class(cls):
         #if not conftest.option.runappdirect:
diff --git a/pypy/module/thread/test/support.py b/pypy/module/thread/test/support.py
--- a/pypy/module/thread/test/support.py
+++ b/pypy/module/thread/test/support.py
@@ -35,7 +35,7 @@
 
 
 class GenericTestThread:
-    spaceconfig = dict(usemodules=('thread', 'time', 'signal'))
+    spaceconfig = dict(usemodules=('thread', 'rctime', 'signal'))
 
     def setup_class(cls):
         if cls.runappdirect: