Merge lp:~mvo/snappy/selftest-docker-robustness into lp:snappy/selftest

[Michael Vogt]

Wait for "framework" service to come up in the tests.

I had some errors that docker did not come after the reboot that look
a lot like a race condition in the 07_test_install_framework. It seems
like sometimes ssh is ready when docker is not (yet). This is why the
test adds a loop waiting for the service (up to 60s).

[John Lenton (chipaca)]

Thank you for this. Feel free to make the changes I mentioned on IRC, or not, as you wish. It didn't feel like bikeshedding when I thought of them, but when I spelled it all out it did :)

review: Approve

=== modified file 'tests/07_test_install_framework'
--- tests/07_test_install_framework	2015-04-20 18:20:04 +0000
+++ tests/07_test_install_framework	2015-05-21 09:32:02 +0000
@@ -1,8 +1,20 @@
 test() {
     if after_reboot; then
-        # ensure the service comes up after a reboot
-        services=$(systemctl | grep "${framework}_.*.service")
-        [ -n "$services" ] || fail "$framework provided no services"
+        # ensure the service comes up after a reboot, give it time
+        # to start (i.e. avoid race between framework and ssh)
+        TIMEOUT=60
+        for i in $(seq $TIMEOUT); do
+            services=$(systemctl | grep "${framework}_.*.service")
+            if [ -n "$services" ]; then
+                echo "Service $framework ready"
+                break
+            fi
+            echo "Waiting for $framework to come up ($i)"
+            sleep 1
+        done
+        if [ $i = $TIMEOUT ]; then
+            fail "$framework provided no services"
+        fi
         return
     fi