[py-svn] r35839 - py/dist/py/test/rsession

[arigo at codespeak.net]

Author: arigo
Date: Sun Dec 17 14:00:53 2006
New Revision: 35839

Modified:
   py/dist/py/test/rsession/box.py
   py/dist/py/test/rsession/rsync.py
Log:
Minor clean-ups.  Move the (commented-out) prints in rsync to their proper place.


Modified: py/dist/py/test/rsession/box.py
==============================================================================
--- py/dist/py/test/rsession/box.py	(original)
+++ py/dist/py/test/rsession/box.py	Sun Dec 17 14:00:53 2006
@@ -8,8 +8,6 @@
 import sys
 import marshal
 
-#NICE_LEVEL = 0     # XXX make it a conftest option
-
 PYTESTSTDOUT = "pyteststdout"
 PYTESTSTDERR = "pyteststderr"
 PYTESTRETVAL = "pytestretval"
@@ -94,7 +92,6 @@
             os.dup2(fdstderr, 2)
         retvalf = self.PYTESTRETVAL.open("w")
         try:
-            from py.__.test.rsession.rsession import remote_options
             if nice_level:
                 os.nice(nice_level)
             retval = self.fun(*self.args, **self.kwargs)

Modified: py/dist/py/test/rsession/rsync.py
==============================================================================
--- py/dist/py/test/rsession/rsync.py	(original)
+++ py/dist/py/test/rsession/rsync.py	Sun Dec 17 14:00:53 2006
@@ -52,8 +52,6 @@
             else:
                 modified_rel_path, checksum = req
                 modifiedpath = os.path.join(self.sourcedir, *modified_rel_path)
-                #print channel.gateway.getremoteaddress(),
-                #print '/'.join(modified_rel_path)
                 f = open(modifiedpath, 'rb')
                 data = f.read()
                 f.close()
@@ -63,6 +61,8 @@
                     # ! there is a reason for the interning:
                     # sharing multiple copies of the file's data
                     data = intern(data)
+                    #print channel.gateway.getremoteaddress(),
+                    #print '/'.join(modified_rel_path)
                 channel.send(data)
                 del data