Change sorted to sort lists not tuples containing lists

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

Hide file tree

Showing 2 changed files with 50 additions and 48 deletions.
diff --git a/tests/__snapshots__/test_stuff.ambr b/tests/__snapshots__/test_stuff.ambr
@@ -33,68 +33,68 @@
   Namespace(dir=False, inputFile=['inputFile'], templates_dir=None, output='.', no_warnings=False, verbose=False)
 # ---
 # name: test_lookForInclude
-  list([
-    list([
-      'tests/testFolder/sites/index.html',
-      'tests/testFolder/sites/myRack.html',
-      'tests/testFolder/sites/bonescrawlhome.html',
-      'tests/testFolder/sites/bonesrunhome.html',
-      'tests/testFolder/sites/bonesboundhome.html',
-      'tests/testFolder/sites/report.html',
-      'tests/testFolder/sites/template.html',
-      'tests/testFolder/sites/bonescallhome.html',
-      'tests/testFolder/sites/404.html',
-      'tests/testFolder/sites/emacsFiles.html',
-      'tests/testFolder/sites/Power7.html',
-      'tests/testFolder/sites/contact.html',
-    ]),
+  tuple(
     list([
-      'tests/testFolder/staging/index.html',
-      'tests/testFolder/staging/myRack.html',
+      'tests/testFolder/staging/404.html',
+      'tests/testFolder/staging/Power7.html',
+      'tests/testFolder/staging/bonesboundhome.html',
+      'tests/testFolder/staging/bonescallhome.html',
       'tests/testFolder/staging/bonescrawlhome.html',
       'tests/testFolder/staging/bonesrunhome.html',
-      'tests/testFolder/staging/bonesboundhome.html',
+      'tests/testFolder/staging/contact.html',
+      'tests/testFolder/staging/emacsFiles.html',
+      'tests/testFolder/staging/index.html',
+      'tests/testFolder/staging/myRack.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_readfilesDir
-  list([
     list([
-      'tests/testFolder/sites/index.html',
-      'tests/testFolder/sites/myRack.html',
+      'tests/testFolder/sites/404.html',
+      'tests/testFolder/sites/Power7.html',
+      'tests/testFolder/sites/bonesboundhome.html',
+      'tests/testFolder/sites/bonescallhome.html',
       'tests/testFolder/sites/bonescrawlhome.html',
       'tests/testFolder/sites/bonesrunhome.html',
-      'tests/testFolder/sites/bonesboundhome.html',
+      'tests/testFolder/sites/contact.html',
+      'tests/testFolder/sites/emacsFiles.html',
+      'tests/testFolder/sites/index.html',
+      'tests/testFolder/sites/myRack.html',
       'tests/testFolder/sites/report.html',
       'tests/testFolder/sites/template.html',
-      'tests/testFolder/sites/bonescallhome.html',
-      'tests/testFolder/sites/404.html',
-      'tests/testFolder/sites/emacsFiles.html',
-      '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',
+      'tests/testFolder/staging/404.html',
+      'tests/testFolder/staging/Power7.html',
+      'tests/testFolder/staging/bonesboundhome.html',
+      'tests/testFolder/staging/bonescallhome.html',
       'tests/testFolder/staging/bonescrawlhome.html',
       'tests/testFolder/staging/bonesrunhome.html',
-      'tests/testFolder/staging/bonesboundhome.html',
+      'tests/testFolder/staging/contact.html',
+      'tests/testFolder/staging/emacsFiles.html',
+      'tests/testFolder/staging/index.html',
+      'tests/testFolder/staging/myRack.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([
+      'tests/testFolder/sites/404.html',
+      'tests/testFolder/sites/Power7.html',
+      'tests/testFolder/sites/bonesboundhome.html',
+      'tests/testFolder/sites/bonescallhome.html',
+      'tests/testFolder/sites/bonescrawlhome.html',
+      'tests/testFolder/sites/bonesrunhome.html',
+      'tests/testFolder/sites/contact.html',
+      'tests/testFolder/sites/emacsFiles.html',
+      'tests/testFolder/sites/index.html',
+      'tests/testFolder/sites/myRack.html',
+      'tests/testFolder/sites/report.html',
+      'tests/testFolder/sites/template.html',
+    ]),
+  )
 # ---
 # name: test_readfilesFile
   tuple(

diff --git a/tests/test_stuff.py b/tests/test_stuff.py
@@ -41,16 +41,18 @@ def test_templates_output_infile(snapshot):
     assert filecheck == snapshot
 
 def test_readfilesDir(snapshot):
-    listFiles = sorted(ssri.getListOfFilesToSearchDir("tests/testFolder/staging", ["tests/testFolder/sites"], True, False ))
-    assert listFiles == snapshot
+    listFiles = ssri.getListOfFilesToSearchDir("tests/testFolder/staging", ["tests/testFolder/sites"], True, False )
+    listFilesSort = (sorted(listFiles[0]), sorted(listFiles[1]))
+    assert listFilesSort == 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 = sorted(ssri.getListOfFilesToSearchDir("tests/testFolder/staging", ["tests/testFolder/sites"], True, False))
-    assert inputFiles == snapshot
+    inputFiles = ssri.getListOfFilesToSearchDir("tests/testFolder/staging", ["tests/testFolder/sites"], True, False)
+    inputFilesSort = (sorted(inputFiles[0]), sorted(inputFiles[1]))
+    assert inputFilesSort == snapshot
 
 
 def test_checkCopyFiles(snapshot):