floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[svn r38391] check more exactly if we are working 

from a default rsync_root (checking
for rsync_root == topdir is not safe
as the topdir may be explicitely contained
in the rsync_root list)

--HG--
branch : trunk
This commit is contained in:
hpk 2007-02-10 16:05:32 +01:00
parent d3e2c68e03
commit bc009c4aef
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
py/test/rsession/hostmanage.py
View File

@ -124,6 +124,7 @@ class HostManager(object):
if roots is None: if roots is None:
roots = [self.config.topdir] roots = [self.config.topdir]
addrel = self.config.topdir.basename addrel = self.config.topdir.basename
self._addrel = addrel
self.roots = roots self.roots = roots
if hosts is None: if hosts is None:
hosts = self.config.getvalue("dist_hosts") hosts = self.config.getvalue("dist_hosts")
@ -144,7 +145,7 @@ class HostManager(object):
for root in self.roots: for root in self.roots:
rsync = HostRSync(root, ignores=ignores, rsync = HostRSync(root, ignores=ignores,
verbose=self.config.option.verbose) verbose=self.config.option.verbose)
if root == self.config.topdir: if self._addrel:
destrelpath = "" destrelpath = ""
else: else:
destrelpath = root.basename destrelpath = root.basename

25
py/test/rsession/testing/test_hostmanage.py
View File

@ -169,10 +169,11 @@ class TestSyncing(DirSetup):
assert not res2 assert not res2
class TestHostManager(DirSetup): class TestHostManager(DirSetup):
def gethostmanager(self, dist_hosts): def gethostmanager(self, dist_hosts, dist_rsync_roots=None):
self.source.join("conftest.py").write(py.code.Source(""" l = ["dist_hosts = %r" % dist_hosts]
dist_hosts = %r if dist_rsync_roots:
""" % (dist_hosts,))) l.append("dist_rsync_roots = %r" % dist_rsync_roots)
self.source.join("conftest.py").write("\n".join(l))
config = py.test.config._reparse([self.source]) config = py.test.config._reparse([self.source])
assert config.topdir == self.source assert config.topdir == self.source
hm = HostManager(config) hm = HostManager(config)
@ -197,7 +198,21 @@ class TestHostManager(DirSetup):
assert dest.join("dir1", "dir2").check() assert dest.join("dir1", "dir2").check()
assert dest.join("dir1", "dir2", 'hello').check() assert dest.join("dir1", "dir2", 'hello').check()
def test_hostmanager_init_rsync_rsync_roots(self): def test_hostmanager_init_rsync_topdir_explicit(self):
dir2 = self.source.ensure("dir1", "dir2", dir=1)
dir2.ensure("hello")
hm = self.gethostmanager(
dist_hosts = ["localhost:%s" % self.dest]
dist_rsync_roots = [self.source]
)
assert hm.config.topdir == self.source
hm.init_rsync([].append)
dest = self.dest.join(self.source.basename)
assert dest.join("dir1").check()
assert dest.join("dir1", "dir2").check()
assert dest.join("dir1", "dir2", 'hello').check()
def test_hostmanager_init_rsync_roots(self):
dir2 = self.source.ensure("dir1", "dir2", dir=1) dir2 = self.source.ensure("dir1", "dir2", dir=1)
self.source.ensure("dir1", "somefile", dir=1) self.source.ensure("dir1", "somefile", dir=1)
dir2.ensure("hello") dir2.ensure("hello")