Merge branch 'baserock/richardmaw/S8740/fix-tests-with-tmpfs'

Reviewed-by: Lars Wirzenius
Reviewed-by: Tiago Gomes

6 files changed, 19 insertions, 19 deletions

diff --git a/morphlib/exts/vdaboot.configure b/morphlib/exts/vdaboot.configure
index cb54bf0d..b88eb3a8 100755
--- a/morphlib/exts/vdaboot.configure
+++ b/morphlib/exts/vdaboot.configure
@@ -20,7 +20,7 @@
 set -e
 
 if [ "$OPENSTACK_USER" ]
-then	
+then
     # Modifying fstab 
     if [ -f "$1/etc/fstab" ]
     then
diff --git a/morphlib/plugins/branch_and_merge_new_plugin.py b/morphlib/plugins/branch_and_merge_new_plugin.py
index 98e675f1..61cd40c0 100644
--- a/morphlib/plugins/branch_and_merge_new_plugin.py
+++ b/morphlib/plugins/branch_and_merge_new_plugin.py
@@ -581,7 +581,7 @@ class SimpleBranchAndMergePlugin(cliapp.Plugin):
         ws = morphlib.workspace.open('.')
         sb = morphlib.sysbranchdir.open_from_within('.')
 
-        for gd in sb.list_git_directories():
+        for gd in sorted(sb.list_git_directories(), key=lambda gd: gd.dirname):
             # Get the repository's original name
             # Continue in the case of error, since the previous iteration
             # worked in the case of the user cloning a repository in the
diff --git a/tests.branching/edit-checkouts-existing-chunk.stdout b/tests.branching/edit-checkouts-existing-chunk.stdout
index 5fbea686..f6ac79c2 100644
--- a/tests.branching/edit-checkouts-existing-chunk.stdout
+++ b/tests.branching/edit-checkouts-existing-chunk.stdout
@@ -1,11 +1,11 @@
 Current branches:
-test:morphs
-* alfred
-
 test:hello
 * alfred
   master
 
+test:morphs
+* alfred
+
 
 Files in hello:
 hello.morph
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
diff --git a/tests.branching/foreach-handles-command-failure.stderr b/tests.branching/foreach-handles-command-failure.stderr
index c3085343..c7b8316b 100644
--- a/tests.branching/foreach-handles-command-failure.stderr
+++ b/tests.branching/foreach-handles-command-failure.stderr
@@ -1 +1 @@
-ERROR: Command failed at repo test:morphs: git remote update non-existant-remote
+ERROR: Command failed at repo test:hello: git remote update non-existant-remote
diff --git a/tests.branching/foreach-handles-command-failure.stdout b/tests.branching/foreach-handles-command-failure.stdout
index 6bb791b3..d687996d 100644
--- a/tests.branching/foreach-handles-command-failure.stdout
+++ b/tests.branching/foreach-handles-command-failure.stdout
@@ -1,2 +1,2 @@
-test:morphs
+test:hello
 fatal: No such remote or remote group: non-existant-remote