summaryrefslogtreecommitdiff
path: root/tests.branching/edit-clones-chunk.stdout
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2013-09-16 14:52:01 +0000
committerRichard Maw <richard.maw@codethink.co.uk>2013-09-16 14:52:01 +0000
commitdea5d6f8cbd86916ec5373fb704c67e1a33e29a8 (patch)
treeb90b1e505075d21ce30ce2be2c96cdf937cd7aba /tests.branching/edit-clones-chunk.stdout
parent0d2f30e6ea01778a8c37b305e42949e57d116ef5 (diff)
downloadmorph-dea5d6f8cbd86916ec5373fb704c67e1a33e29a8.tar.gz
foreach: sort repositories asciibetically
The test suite checks the output of the foreach command, this requires repositories to be returned in a stable order. The order returned from os.listdir differs by the filesystem used. btrfs returns roughly in insertion order, tmpfs alphabetically. This allowed the failure to sort pass through unchecked, since I was testing on btrfs, but people discovered issues when using /tmp, which is a tmpfs. To fix this, foreach sorts the result of list_git_directories() by directory name. The previous code would always return the root repository first, this was a unnecessary complication, so now everything is returned asciibetically and the tests amended to reflect this.
Diffstat (limited to 'tests.branching/edit-clones-chunk.stdout')
-rw-r--r--tests.branching/edit-clones-chunk.stdout24
1 files changed, 12 insertions, 12 deletions
diff --git a/tests.branching/edit-clones-chunk.stdout b/tests.branching/edit-clones-chunk.stdout
index dd3f00ef..d0bcb565 100644
--- a/tests.branching/edit-clones-chunk.stdout
+++ b/tests.branching/edit-clones-chunk.stdout
@@ -1,19 +1,21 @@
Current branches:
-test:morphs
+test:hello
master
* newbranch
-test:hello
+test:morphs
master
* newbranch
Current origins:
-test:morphs
+test:hello
* remote origin
- Fetch URL: file://TMP/morphs
- Push URL: file://TMP/morphs
- HEAD branch: master
+ Fetch URL: file://TMP/hello
+ Push URL: file://TMP/hello
+ HEAD branch (remote HEAD is ambiguous, may be one of the following):
+ alfred
+ master
Remote branches:
alfred tracked
master tracked
@@ -22,13 +24,11 @@ test:morphs
Local ref configured for 'git push':
master pushes to master (up to date)
-test:hello
+test:morphs
* remote origin
- Fetch URL: file://TMP/hello
- Push URL: file://TMP/hello
- HEAD branch (remote HEAD is ambiguous, may be one of the following):
- alfred
- master
+ Fetch URL: file://TMP/morphs
+ Push URL: file://TMP/morphs
+ HEAD branch: master
Remote branches:
alfred tracked
master tracked