tests: fixed the test that creates initial settings files

KenKundert · Sep 4, 2021 · 4a7382f · 4a7382f
1 parent 25005d0
commit 4a7382f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/tests/test-cases.nt b/tests/test-cases.nt
@@ -4,6 +4,7 @@ emborg without configs:
         args: version
         expected: emborg version: \d+\.\d+\.\d+ \(\d\d\d\d-\d\d-\d\d\) \[Python \d\.\d+\.\d+\]\.
         expected_type: regex
+        remove: .config
 
     -
         args: help
@@ -160,6 +161,7 @@ emborg without configs:
             >                             0077)
 
     -
+        args:
         expected:
             > Configuration directory created: /«TESTS»/.config/emborg.
             > Includes example settings files. Edit them to suit your needs.

diff --git a/tests/test_emborg.py b/tests/test_emborg.py
@@ -32,7 +32,7 @@
 
 # schema for test cases {{{2
 emborg_schema = Schema({
-    Optional('args', default=[]): Any(str, list),
+    Optional('args', default='<PASS>'): Any(str, list),
     Optional('expected', default=""): str,
     Optional('expected_type', default=""): str,
     Optional('cmp_dirs', default=""): str,
@@ -76,17 +76,19 @@ def __init__(self, args, expected, expected_type, cmp_dirs, remove):
 
         # expand «TESTS» and «DATE»
         date = arrow.now().format("YYYY-MM-DD")
-        if args:
-            args = args.replace("«TESTS»", tests_dir_wo_slash)
-            args = args.replace("«DATE»", date)
+
+        # replace «TESTS» and «DATE» macros
+        args = args.split() if is_str(args) else args
+        args = [a.replace("«TESTS»", tests_dir_wo_slash) for a in args]
+        args = [a.replace("«DATE»", date) for a in args]
         if expected is not None:
             expected = expected.replace("«TESTS»", tests_dir_wo_slash)
             expected = expected.replace("«DATE»", date)
         if cmp_dirs:
             cmp_dirs = cmp_dirs.replace("«TESTS»", tests_dir_wo_slash)
             cmp_dirs = cmp_dirs.replace("«DATE»", date)
 
-        self.args = args.split() if is_str(args) else args
+        self.args = args
         self.expected = expected.strip("\n")
         self.expected_type = expected_type.split()
         self.cmp_dirs = cmp_dirs.split() if is_str(cmp_dirs) else cmp_dirs
@@ -100,7 +102,7 @@ def run(self):
         # remove requested files and directories
         if self.remove:
             rm(self.remove.split())
-        if not self.args:
+        if '<PASS>' in self.args:
             return True
 
         # run command