Skip to content

Commit fe97f32

Browse files
committed
Change sorted to sort lists not tuples containing lists
1 parent 3f1ec81 commit fe97f32

File tree

2 files changed

+50
-48
lines changed

2 files changed

+50
-48
lines changed

tests/__snapshots__/test_stuff.ambr

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -33,68 +33,68 @@
3333
Namespace(dir=False, inputFile=['inputFile'], templates_dir=None, output='.', no_warnings=False, verbose=False)
3434
# ---
3535
# name: test_lookForInclude
36-
list([
37-
list([
38-
'tests/testFolder/sites/index.html',
39-
'tests/testFolder/sites/myRack.html',
40-
'tests/testFolder/sites/bonescrawlhome.html',
41-
'tests/testFolder/sites/bonesrunhome.html',
42-
'tests/testFolder/sites/bonesboundhome.html',
43-
'tests/testFolder/sites/report.html',
44-
'tests/testFolder/sites/template.html',
45-
'tests/testFolder/sites/bonescallhome.html',
46-
'tests/testFolder/sites/404.html',
47-
'tests/testFolder/sites/emacsFiles.html',
48-
'tests/testFolder/sites/Power7.html',
49-
'tests/testFolder/sites/contact.html',
50-
]),
36+
tuple(
5137
list([
52-
'tests/testFolder/staging/index.html',
53-
'tests/testFolder/staging/myRack.html',
38+
'tests/testFolder/staging/404.html',
39+
'tests/testFolder/staging/Power7.html',
40+
'tests/testFolder/staging/bonesboundhome.html',
41+
'tests/testFolder/staging/bonescallhome.html',
5442
'tests/testFolder/staging/bonescrawlhome.html',
5543
'tests/testFolder/staging/bonesrunhome.html',
56-
'tests/testFolder/staging/bonesboundhome.html',
44+
'tests/testFolder/staging/contact.html',
45+
'tests/testFolder/staging/emacsFiles.html',
46+
'tests/testFolder/staging/index.html',
47+
'tests/testFolder/staging/myRack.html',
5748
'tests/testFolder/staging/report.html',
5849
'tests/testFolder/staging/template.html',
59-
'tests/testFolder/staging/bonescallhome.html',
60-
'tests/testFolder/staging/404.html',
61-
'tests/testFolder/staging/emacsFiles.html',
62-
'tests/testFolder/staging/Power7.html',
63-
'tests/testFolder/staging/contact.html',
6450
]),
65-
])
66-
# ---
67-
# name: test_readfilesDir
68-
list([
6951
list([
70-
'tests/testFolder/sites/index.html',
71-
'tests/testFolder/sites/myRack.html',
52+
'tests/testFolder/sites/404.html',
53+
'tests/testFolder/sites/Power7.html',
54+
'tests/testFolder/sites/bonesboundhome.html',
55+
'tests/testFolder/sites/bonescallhome.html',
7256
'tests/testFolder/sites/bonescrawlhome.html',
7357
'tests/testFolder/sites/bonesrunhome.html',
74-
'tests/testFolder/sites/bonesboundhome.html',
58+
'tests/testFolder/sites/contact.html',
59+
'tests/testFolder/sites/emacsFiles.html',
60+
'tests/testFolder/sites/index.html',
61+
'tests/testFolder/sites/myRack.html',
7562
'tests/testFolder/sites/report.html',
7663
'tests/testFolder/sites/template.html',
77-
'tests/testFolder/sites/bonescallhome.html',
78-
'tests/testFolder/sites/404.html',
79-
'tests/testFolder/sites/emacsFiles.html',
80-
'tests/testFolder/sites/Power7.html',
81-
'tests/testFolder/sites/contact.html',
8264
]),
65+
)
66+
# ---
67+
# name: test_readfilesDir
68+
tuple(
8369
list([
84-
'tests/testFolder/staging/index.html',
85-
'tests/testFolder/staging/myRack.html',
70+
'tests/testFolder/staging/404.html',
71+
'tests/testFolder/staging/Power7.html',
72+
'tests/testFolder/staging/bonesboundhome.html',
73+
'tests/testFolder/staging/bonescallhome.html',
8674
'tests/testFolder/staging/bonescrawlhome.html',
8775
'tests/testFolder/staging/bonesrunhome.html',
88-
'tests/testFolder/staging/bonesboundhome.html',
76+
'tests/testFolder/staging/contact.html',
77+
'tests/testFolder/staging/emacsFiles.html',
78+
'tests/testFolder/staging/index.html',
79+
'tests/testFolder/staging/myRack.html',
8980
'tests/testFolder/staging/report.html',
9081
'tests/testFolder/staging/template.html',
91-
'tests/testFolder/staging/bonescallhome.html',
92-
'tests/testFolder/staging/404.html',
93-
'tests/testFolder/staging/emacsFiles.html',
94-
'tests/testFolder/staging/Power7.html',
95-
'tests/testFolder/staging/contact.html',
9682
]),
97-
])
83+
list([
84+
'tests/testFolder/sites/404.html',
85+
'tests/testFolder/sites/Power7.html',
86+
'tests/testFolder/sites/bonesboundhome.html',
87+
'tests/testFolder/sites/bonescallhome.html',
88+
'tests/testFolder/sites/bonescrawlhome.html',
89+
'tests/testFolder/sites/bonesrunhome.html',
90+
'tests/testFolder/sites/contact.html',
91+
'tests/testFolder/sites/emacsFiles.html',
92+
'tests/testFolder/sites/index.html',
93+
'tests/testFolder/sites/myRack.html',
94+
'tests/testFolder/sites/report.html',
95+
'tests/testFolder/sites/template.html',
96+
]),
97+
)
9898
# ---
9999
# name: test_readfilesFile
100100
tuple(

tests/test_stuff.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,18 @@ def test_templates_output_infile(snapshot):
4141
assert filecheck == snapshot
4242

4343
def test_readfilesDir(snapshot):
44-
listFiles = sorted(ssri.getListOfFilesToSearchDir("tests/testFolder/staging", ["tests/testFolder/sites"], True, False ))
45-
assert listFiles == snapshot
44+
listFiles = ssri.getListOfFilesToSearchDir("tests/testFolder/staging", ["tests/testFolder/sites"], True, False )
45+
listFilesSort = (sorted(listFiles[0]), sorted(listFiles[1]))
46+
assert listFilesSort == snapshot
4647

4748
def test_readfilesFile(snapshot):
4849
listFiles = ssri.getListOfFilesToSearchFiles(["tests/testFolder/staging/emacsFiles.html"], ["tests/testFolder/sites"], "tests/testFolder/templates", False, 0, False)
4950
assert listFiles == snapshot
5051

5152
def test_lookForInclude(snapshot):
52-
inputFiles = sorted(ssri.getListOfFilesToSearchDir("tests/testFolder/staging", ["tests/testFolder/sites"], True, False))
53-
assert inputFiles == snapshot
53+
inputFiles = ssri.getListOfFilesToSearchDir("tests/testFolder/staging", ["tests/testFolder/sites"], True, False)
54+
inputFilesSort = (sorted(inputFiles[0]), sorted(inputFiles[1]))
55+
assert inputFilesSort == snapshot
5456

5557

5658
def test_checkCopyFiles(snapshot):

0 commit comments

Comments
 (0)