summaryrefslogtreecommitdiffstats
path: root/testsuite/Testsrc
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2013-05-21 16:04:24 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2013-05-21 16:14:12 -0400
commitca43145539ec82623c9fd8f62a1e05f261cdf215 (patch)
treeb6991a7cf7782f3e5a165abf4c97a024e7455441 /testsuite/Testsrc
parentf55238772edf411cb101f4b179c357fffa665345 (diff)
downloadbcfg2-ca43145539ec82623c9fd8f62a1e05f261cdf215.tar.gz
bcfg2-ca43145539ec82623c9fd8f62a1e05f261cdf215.tar.bz2
bcfg2-ca43145539ec82623c9fd8f62a1e05f261cdf215.zip
POSIX: fix directory pruning
Diffstat (limited to 'testsuite/Testsrc')
-rw-r--r--testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIX/TestDirectory.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIX/TestDirectory.py b/testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIX/TestDirectory.py
index d9431dc63..d14696b68 100644
--- a/testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIX/TestDirectory.py
+++ b/testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIX/TestDirectory.py
@@ -70,7 +70,7 @@ class TestPOSIXDirectory(TestPOSIXTool):
expected = [os.path.join(entry.get("name"), e)
for e in entries
if os.path.join(entry.get("name"), e) not in modlist]
- actual = [e.get("path") for e in entry.findall("Prune")]
+ actual = [e.get("name") for e in entry.findall("Prune")]
self.assertItemsEqual(expected, actual)
mock_verify.reset_mock()
@@ -137,7 +137,7 @@ class TestPOSIXDirectory(TestPOSIXTool):
entry.set("prune", "true")
prune = ["/test/foo/bar/prune1", "/test/foo/bar/prune2"]
for path in prune:
- lxml.etree.SubElement(entry, "Prune", path=path)
+ lxml.etree.SubElement(entry, "Prune", name=path)
reset()
mock_install.return_value = True
@@ -145,6 +145,6 @@ class TestPOSIXDirectory(TestPOSIXTool):
self.assertTrue(ptool.install(entry))
ptool._exists.assert_called_with(entry)
mock_install.assert_called_with(ptool, entry)
- self.assertItemsEqual([c[0][0].get("path")
+ self.assertItemsEqual([c[0][0].get("name")
for c in ptool._remove.call_args_list],
prune)