[svn r38164] Move source as an rsync initialisation argument rather than

as a send parameter

--HG--
branch : trunk

py/test/rsession/hostmanage.py

@@ -67,14 +67,14 @@ class HostInfo(object):
 class HostRSync(py.execnet.RSync):
     """ RSyncer that filters out common files 
     """
-    def __init__(self, *args, **kwargs):
+    def __init__(self, source, *args, **kwargs):
         self._synced = {}
         ignores= None
         if 'ignores' in kwargs:
             ignores = kwargs.pop('ignores')
         self._ignores = ignores or []
         kwargs['delete'] = True
-        super(HostRSync, self).__init__(**kwargs)
+        super(HostRSync, self).__init__(source, **kwargs)
 
     def filter(self, path):
         path = py.path.local(path)
@@ -129,7 +129,7 @@ class HostManager(object):
         ignores = self.config.getvalue_pathlist("dist_rsync_ignore")
         self.prepare_gateways(reporter)
         for root in self.roots:
-            rsync = HostRSync(ignores=ignores, 
+            rsync = HostRSync(root, ignores=ignores, 
                               verbose=self.config.option.verbose)
             destrelpath = root.relto(self.config.topdir)
             for host in self.hosts:
@@ -139,7 +139,7 @@ class HostManager(object):
                     host, reporter, destrelpath, finishedcallback=
                     lambda host=host, root=root: donecallback(host, root))
                 reporter(repevent.HostRSyncing(host, root, remotepath))
-            rsync.send(root)
+            rsync.send()
 
     def setup_hosts(self, reporter):
         self.init_rsync(reporter)
@@ -170,12 +170,12 @@ class HostManager(object):
 
     def teardown_gateways(self, reporter, channels):
         for channel in channels:
+            #try:
             try:
-                repevent.wrapcall(reporter, channel.waitclose)
-            except KeyboardInterrupt, SystemExit:
-                raise
-            except:
-                pass
+                repevent.wrapcall(reporter, channel.waitclose, 1)
+            except IOError: # timeout
+                # force closing
+                channel.close()
             channel.gateway.exit()
 
 def gethomedir():

py/test/rsession/testing/test_hostmanage.py

@@ -106,7 +106,7 @@ class TestSyncing(DirSetup):
         self.source.ensure(".svn", "entries")
         self.source.ensure(".somedotfile", "moreentries")
         self.source.ensure("somedir", "editfile~")
-        syncer = HostRSync()
+        syncer = HostRSync(self.source)
         l = list(self.source.visit(rec=syncer.filter,
                                    fil=syncer.filter))
         assert len(l) == 3
@@ -118,18 +118,18 @@ class TestSyncing(DirSetup):
     def test_hrsync_one_host(self):
         h1 = self._gethostinfo()
         finished = []
-        rsync = HostRSync()
+        rsync = HostRSync(self.source)
         h1.initgateway()
         rsync.add_target_host(h1)
         self.source.join("hello.py").write("world")
-        rsync.send(self.source)
+        rsync.send()
         assert self.dest.join("hello.py").check()
 
     def test_hrsync_same_host_twice(self):
         h1 = self._gethostinfo()
         h2 = self._gethostinfo()
         finished = []
-        rsync = HostRSync()
+        rsync = HostRSync(self.source)
         l = []
         h1.initgateway()
         res1 = rsync.add_target_host(h1)