move code to fewer more sensible modules.

testing/test_slavemanage.py

@@ -0,0 +1,241 @@
+import py
+import os
+import execnet
+from xdist.slavemanage import GatewayManager, HostRSync
+from xdist.slavemanage import NodeManager
+
+def pytest_funcarg__hookrecorder(request):
+    _pytest = request.getfuncargvalue('_pytest')
+    hook = request.getfuncargvalue('hook')
+    return _pytest.gethookrecorder(hook)
+
+def pytest_funcarg__hook(request):
+    from xdist import newhooks
+    from py._test.pluginmanager import HookRelay, Registry
+    from py._plugin import hookspec
+    return HookRelay([hookspec, newhooks], Registry())
+
+class pytest_funcarg__mysetup:
+    def __init__(self, request):
+        basetemp = request.config.mktemp(
+            "mysetup-%s" % request.function.__name__,
+            numbered=True)
+        self.source = basetemp.mkdir("source")
+        self.dest = basetemp.mkdir("dest")
+        request.getfuncargvalue("_pytest")
+
+class TestGatewayManagerPopen:
+    def test_popen_no_default_chdir(self, hook):
+        gm = GatewayManager(["popen"], hook)
+        assert gm.specs[0].chdir is None
+
+    def test_default_chdir(self, hook):
+        l = ["ssh=noco", "socket=xyz"]
+        for spec in GatewayManager(l, hook).specs:
+            assert spec.chdir == "pyexecnetcache"
+        for spec in GatewayManager(l, hook, defaultchdir="abc").specs:
+            assert spec.chdir == "abc"
+
+    def test_popen_makegateway_events(self, hook, hookrecorder, _pytest):
+        hm = GatewayManager(["popen"] * 2, hook)
+        hm.makegateways()
+        call = hookrecorder.popcall("pytest_gwmanage_newgateway")
+        assert call.gateway.spec == execnet.XSpec("popen")
+        assert call.gateway.id == "gw0"
+        call = hookrecorder.popcall("pytest_gwmanage_newgateway")
+        assert call.gateway.id == "gw1"
+        assert len(hm.group) == 2
+        hm.exit()
+        assert not len(hm.group)
+
+    def test_popens_rsync(self, hook, mysetup):
+        source = mysetup.source
+        hm = GatewayManager(["popen"] * 2, hook)
+        hm.makegateways()
+        assert len(hm.group) == 2
+        for gw in hm.group:
+            class pseudoexec:
+                args = []
+                def __init__(self, *args):
+                    self.args.extend(args)
+                def waitclose(self):
+                    pass
+            gw.remote_exec = pseudoexec
+        l = []
+        hm.rsync(source, notify=lambda *args: l.append(args))
+        assert not l
+        hm.exit()
+        assert not len(hm.group)
+        assert "sys.path.insert" in gw.remote_exec.args[0]
+
+    def test_rsync_popen_with_path(self, hook, mysetup):
+        source, dest = mysetup.source, mysetup.dest
+        hm = GatewayManager(["popen//chdir=%s" %dest] * 1, hook)
+        hm.makegateways()
+        source.ensure("dir1", "dir2", "hello")
+        l = []
+        hm.rsync(source, notify=lambda *args: l.append(args))
+        assert len(l) == 1
+        assert l[0] == ("rsyncrootready", hm.group['gw0'].spec, source)
+        hm.exit()
+        dest = dest.join(source.basename)
+        assert dest.join("dir1").check()
+        assert dest.join("dir1", "dir2").check()
+        assert dest.join("dir1", "dir2", 'hello').check()
+
+    def test_rsync_same_popen_twice(self, hook, mysetup, hookrecorder):
+        source, dest = mysetup.source, mysetup.dest
+        hm = GatewayManager(["popen//chdir=%s" %dest] * 2, hook)
+        hm.makegateways()
+        source.ensure("dir1", "dir2", "hello")
+        hm.rsync(source)
+        call = hookrecorder.popcall("pytest_gwmanage_rsyncstart")
+        assert call.source == source
+        assert len(call.gateways) == 1
+        assert call.gateways[0] in hm.group
+        call = hookrecorder.popcall("pytest_gwmanage_rsyncfinish")
+
+class TestHRSync:
+    class pytest_funcarg__mysetup:
+        def __init__(self, request):
+            tmp = request.getfuncargvalue('tmpdir')
+            self.source = tmp.mkdir("source")
+            self.dest = tmp.mkdir("dest")
+
+    def test_hrsync_filter(self, mysetup):
+        source, dest = mysetup.source, mysetup.dest
+        source.ensure("dir", "file.txt")
+        source.ensure(".svn", "entries")
+        source.ensure(".somedotfile", "moreentries")
+        source.ensure("somedir", "editfile~")
+        syncer = HostRSync(source)
+        l = list(source.visit(rec=syncer.filter,
+                                   fil=syncer.filter))
+        assert len(l) == 3
+        basenames = [x.basename for x in l]
+        assert 'dir' in basenames
+        assert 'file.txt' in basenames
+        assert 'somedir' in basenames
+
+    def test_hrsync_one_host(self, mysetup):
+        source, dest = mysetup.source, mysetup.dest
+        gw = execnet.makegateway("popen//chdir=%s" % dest)
+        finished = []
+        rsync = HostRSync(source)
+        rsync.add_target_host(gw, finished=lambda: finished.append(1))
+        source.join("hello.py").write("world")
+        rsync.send()
+        gw.exit()
+        assert dest.join(source.basename, "hello.py").check()
+        assert len(finished) == 1
+
+
+class TestNodeManager:
+    @py.test.mark.xfail
+    def test_rsync_roots_no_roots(self, testdir, mysetup):
+        mysetup.source.ensure("dir1", "file1").write("hello")
+        config = testdir.reparseconfig([source])
+        nodemanager = NodeManager(config, ["popen//chdir=%s" % mysetup.dest])
+        #assert nodemanager.config.topdir == source == config.topdir
+        nodemanager.rsync_roots()
+        p, = nodemanager.gwmanager.multi_exec(
+            "import os ; channel.send(os.getcwd())").receive_each()
+        p = py.path.local(p)
+        py.builtin.print_("remote curdir", p)
+        assert p == mysetup.dest.join(config.topdir.basename)
+        assert p.join("dir1").check()
+        assert p.join("dir1", "file1").check()
+
+    def test_popen_rsync_subdir(self, testdir, mysetup):
+        source, dest = mysetup.source, mysetup.dest
+        dir1 = mysetup.source.mkdir("dir1")
+        dir2 = dir1.mkdir("dir2")
+        dir2.ensure("hello")
+        for rsyncroot in (dir1, source):
+            dest.remove()
+            nodemanager = NodeManager(testdir.parseconfig(
+                "--tx", "popen//chdir=%s" % dest,
+                "--rsyncdir", rsyncroot,
+                source,
+            ))
+            #assert nodemanager.config.topdir == source
+            nodemanager.rsync_roots()
+            if rsyncroot == source:
+                dest = dest.join("source")
+            assert dest.join("dir1").check()
+            assert dest.join("dir1", "dir2").check()
+            assert dest.join("dir1", "dir2", 'hello').check()
+            nodemanager.gwmanager.exit()
+
+    def test_init_rsync_roots(self, testdir, mysetup):
+        source, dest = mysetup.source, mysetup.dest
+        dir2 = source.ensure("dir1", "dir2", dir=1)
+        source.ensure("dir1", "somefile", dir=1)
+        dir2.ensure("hello")
+        source.ensure("bogusdir", "file")
+        source.join("conftest.py").write(py.code.Source("""
+            rsyncdirs = ['dir1/dir2']
+        """))
+        config = testdir.reparseconfig([source])
+        nodemanager = NodeManager(config, ["popen//chdir=%s" % dest])
+        nodemanager.rsync_roots()
+        assert dest.join("dir2").check()
+        assert not dest.join("dir1").check()
+        assert not dest.join("bogus").check()
+
+    def test_rsyncignore(self, testdir, mysetup):
+        source, dest = mysetup.source, mysetup.dest
+        dir2 = source.ensure("dir1", "dir2", dir=1)
+        dir5 = source.ensure("dir5", "dir6", "bogus")
+        dirf = source.ensure("dir5", "file")
+        dir2.ensure("hello")
+        source.join("conftest.py").write(py.code.Source("""
+            rsyncdirs = ['dir1', 'dir5']
+            rsyncignore = ['dir1/dir2', 'dir5/dir6']
+        """))
+        config = testdir.reparseconfig([source])
+        nodemanager = NodeManager(config, ["popen//chdir=%s" % dest])
+        nodemanager.rsync_roots()
+        assert dest.join("dir1").check()
+        assert not dest.join("dir1", "dir2").check()
+        assert dest.join("dir5","file").check()
+        assert not dest.join("dir6").check()
+
+    def test_optimise_popen(self, testdir, mysetup):
+        source, dest = mysetup.source, mysetup.dest
+        specs = ["popen"] * 3
+        source.join("conftest.py").write("rsyncdirs = ['a']")
+        source.ensure('a', dir=1)
+        config = testdir.reparseconfig([source])
+        nodemanager = NodeManager(config, specs)
+        nodemanager.rsync_roots()
+        for gwspec in nodemanager.gwmanager.specs:
+            assert gwspec._samefilesystem()
+            assert not gwspec.chdir
+
+    def test_setup_DEBUG(self, mysetup, testdir):
+        source = mysetup.source
+        specs = ["popen"] * 2
+        source.join("conftest.py").write("rsyncdirs = ['a']")
+        source.ensure('a', dir=1)
+        config = testdir.reparseconfig([source, '--debug'])
+        assert config.option.debug
+        nodemanager = NodeManager(config, specs)
+        reprec = testdir.getreportrecorder(config).hookrecorder
+        nodemanager.setup_nodes(putevent=[].append)
+        for spec in nodemanager.gwmanager.specs:
+            l = reprec.getcalls("pytest_trace")
+            assert l
+        nodemanager.teardown_nodes()
+
+    def test_ssh_setup_nodes(self, specssh, testdir):
+        testdir.makepyfile(__init__="", test_x="""
+            def test_one():
+                pass
+        """)
+        reprec = testdir.inline_run("-d", "--rsyncdir=%s" % testdir.tmpdir,
+                "--tx", specssh, testdir.tmpdir)
+        rep, = reprec.getreports("pytest_runtest_logreport")
+        assert rep.passed
+
+