summaryrefslogtreecommitdiff
path: root/subplot/vmadm.py
diff options
context:
space:
mode:
Diffstat (limited to 'subplot/vmadm.py')
-rw-r--r--subplot/vmadm.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/subplot/vmadm.py b/subplot/vmadm.py
index 1ee2914..ae3a3a3 100644
--- a/subplot/vmadm.py
+++ b/subplot/vmadm.py
@@ -19,7 +19,7 @@ def install_vmadm(ctx):
# This can be removed once the Subplot lib/files library creates
# directories.
os.mkdir(".ssh")
- os.mkdir("expected")
+ os.makedirs("expected/init-test")
os.mkdir("images")
@@ -48,12 +48,12 @@ def directories_match(ctx, actual=None, expected=None):
assert_eq = globals()["assert_eq"]
efiles = list(sorted(os.listdir(expected)))
- afiles = list(sorted(os.listdir(expected)))
+ afiles = list(sorted(os.listdir(actual)))
assert_eq(efiles, afiles)
for filename in efiles:
- with open(os.path.join("expected", filename)) as f:
+ with open(os.path.join(expected, filename)) as f:
edata = yaml.safe_load(f)
- with open(os.path.join("actual", filename)) as f:
+ with open(os.path.join(actual, filename)) as f:
adata = yaml.safe_load(f)
if "runcmd" in adata:
del adata["runcmd"]