This *should* just work tm - more test fixes

Sebagabones · Dec 26, 2024 · 3f1ec81 · 3f1ec81
1 parent 4708119
commit 3f1ec81
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 22 deletions.
diff --git a/tests/__snapshots__/test_stuff.ambr b/tests/__snapshots__/test_stuff.ambr
@@ -33,21 +33,7 @@
   Namespace(dir=False, inputFile=['inputFile'], templates_dir=None, output='.', no_warnings=False, verbose=False)
 # ---
 # name: test_lookForInclude
-  tuple(
-    list([
-      'tests/testFolder/staging/index.html',
-      'tests/testFolder/staging/myRack.html',
-      'tests/testFolder/staging/bonescrawlhome.html',
-      'tests/testFolder/staging/bonesrunhome.html',
-      'tests/testFolder/staging/bonesboundhome.html',
-      'tests/testFolder/staging/report.html',
-      'tests/testFolder/staging/template.html',
-      'tests/testFolder/staging/bonescallhome.html',
-      'tests/testFolder/staging/404.html',
-      'tests/testFolder/staging/emacsFiles.html',
-      'tests/testFolder/staging/Power7.html',
-      'tests/testFolder/staging/contact.html',
-    ]),
+  list([
     list([
       'tests/testFolder/sites/index.html',
       'tests/testFolder/sites/myRack.html',
@@ -62,10 +48,6 @@
       'tests/testFolder/sites/Power7.html',
       'tests/testFolder/sites/contact.html',
     ]),
-  )
-# ---
-# name: test_readfilesDir
-  tuple(
     list([
       'tests/testFolder/staging/index.html',
       'tests/testFolder/staging/myRack.html',
@@ -80,6 +62,10 @@
       'tests/testFolder/staging/Power7.html',
       'tests/testFolder/staging/contact.html',
     ]),
+  ])
+# ---
+# name: test_readfilesDir
+  list([
     list([
       'tests/testFolder/sites/index.html',
       'tests/testFolder/sites/myRack.html',
@@ -94,7 +80,21 @@
       'tests/testFolder/sites/Power7.html',
       'tests/testFolder/sites/contact.html',
     ]),
-  )
+    list([
+      'tests/testFolder/staging/index.html',
+      'tests/testFolder/staging/myRack.html',
+      'tests/testFolder/staging/bonescrawlhome.html',
+      'tests/testFolder/staging/bonesrunhome.html',
+      'tests/testFolder/staging/bonesboundhome.html',
+      'tests/testFolder/staging/report.html',
+      'tests/testFolder/staging/template.html',
+      'tests/testFolder/staging/bonescallhome.html',
+      'tests/testFolder/staging/404.html',
+      'tests/testFolder/staging/emacsFiles.html',
+      'tests/testFolder/staging/Power7.html',
+      'tests/testFolder/staging/contact.html',
+    ]),
+  ])
 # ---
 # name: test_readfilesFile
   tuple(

diff --git a/tests/test_stuff.py b/tests/test_stuff.py
@@ -41,15 +41,15 @@ def test_templates_output_infile(snapshot):
     assert filecheck == snapshot
 
 def test_readfilesDir(snapshot):
-    listFiles = ssri.getListOfFilesToSearchDir("tests/testFolder/staging", ["tests/testFolder/sites"], True, False )
+    listFiles = sorted(ssri.getListOfFilesToSearchDir("tests/testFolder/staging", ["tests/testFolder/sites"], True, False ))
     assert listFiles == snapshot
 
 def test_readfilesFile(snapshot):
     listFiles = ssri.getListOfFilesToSearchFiles(["tests/testFolder/staging/emacsFiles.html"], ["tests/testFolder/sites"], "tests/testFolder/templates", False, 0, False)
     assert listFiles == snapshot
 
 def test_lookForInclude(snapshot):
-    inputFiles = ssri.getListOfFilesToSearchDir("tests/testFolder/staging", ["tests/testFolder/sites"], True, False)
+    inputFiles = sorted(ssri.getListOfFilesToSearchDir("tests/testFolder/staging", ["tests/testFolder/sites"], True, False))
     assert inputFiles == snapshot