make the tests more robust

KenKundert · May 17, 2023 · a8653dc · a8653dc
1 parent f0fcfd9
commit a8653dc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/tests/test-cases.nt b/tests/test-cases.nt
@@ -591,10 +591,10 @@ emborg with configs:
     magnate:
         args: --quiet due
         expected:
-            > test0: (just now|(\d+ )?(seconds|minutes)) since last backup\.
-            > test1: (just now|(\d+ )?(seconds|minutes)) since last backup\.
-            > test2: (just now|(\d+ )?(seconds|minutes)) since last backup\.
-            > test3: (just now|(\d+ )?(seconds|minutes)) since last backup\.
+            > test0: (just now|(\d+(\.\d)? )?(seconds|minutes)) since last backup\.
+            > test1: (just now|(\d+(\.\d)? )?(seconds|minutes)) since last backup\.
+            > test2: (just now|(\d+(\.\d)? )?(seconds|minutes)) since last backup\.
+            > test3: (just now|(\d+(\.\d)? )?(seconds|minutes)) since last backup\.
         expected_type: regex
 
     build:

diff --git a/tests/test_emborg.py b/tests/test_emborg.py
@@ -133,7 +133,12 @@ def run(self):
             if 'regex' in self.expected_type:
                 matches = bool(re.fullmatch(expected, result))
             else:
-                matches = expected == result
+                if 'error' in self.expected_type:
+                    # because error messages use wrapping the white space can
+                    # vary, so simply eliminate the white space
+                    matches = expected.split() == result.split()
+                else:
+                    matches = expected == result
 
         if matches and self.cmp_dirs:
             gen_dir, ref_dir = self.cmp_dirs