Merge lp:~elopio/snappy/go-tests2 into lp:~fgimenez/snappy/go-functional-tests

[Leo Arias]

Reorganization of the test files.
Run the go tests and the bash tests.

[Federico Gimenez (fgimenez)]

Thanks! :)

review: Approve

=== renamed directory 'integration-tests' => '_integration-tests'
=== renamed file 'integration-tests/run-in-image/README' => '_integration-tests/README'
=== renamed file 'debian/integration-tests/main.go' => '_integration-tests/main.go'
=== renamed file 'integration-tests/run-in-image/snappy-selftest' => '_integration-tests/snappy-selftest'
--- integration-tests/run-in-image/snappy-selftest	2015-05-22 12:44:41 +0000
+++ _integration-tests/snappy-selftest	2015-06-15 15:37:42 +0000
@@ -2,12 +2,12 @@
 
 set -e
 
-. tests/framework
+MYDIR=$(dirname $0)
+
+. $MYDIR/tests/framework
 
 SNAPPY=snappy
 
-MYDIR=$(dirname $0)
-
 if [ "$1" != "--yes-really" ]; then
     echo "The selftest may be destructive, please run with:"
     echo "   --yes-really"
@@ -15,9 +15,9 @@
     exit 1
 fi
 
-. tests/settings
+. $MYDIR/tests/settings
 
-. tests/common.sh
+. $MYDIR/tests/common.sh
 
 # prepare the environment
 if [ -z "$ADT_REBOOT_MARK" ]; then

=== added directory '_integration-tests/tests'
=== renamed file 'integration-tests/run-in-image/tests/01_test_info' => '_integration-tests/tests/01_test_info'
=== renamed file 'integration-tests/run-in-image/tests/02_test_versions' => '_integration-tests/tests/02_test_versions'
=== renamed file 'integration-tests/run-in-image/tests/03_test_apt' => '_integration-tests/tests/03_test_apt'
=== renamed file 'integration-tests/run-in-image/tests/04_test_install_hello' => '_integration-tests/tests/04_test_install_hello'
=== renamed file 'integration-tests/run-in-image/tests/05_test_install_nonexistant' => '_integration-tests/tests/05_test_install_nonexistant'
=== renamed file 'integration-tests/run-in-image/tests/06_test_search_framework' => '_integration-tests/tests/06_test_search_framework'
=== renamed file 'integration-tests/run-in-image/tests/07_test_install_framework' => '_integration-tests/tests/07_test_install_framework'
=== renamed file 'integration-tests/run-in-image/tests/08_test_versions_has_framework' => '_integration-tests/tests/08_test_versions_has_framework'
=== renamed file 'integration-tests/run-in-image/tests/10_test_info_has_stuff' => '_integration-tests/tests/10_test_info_has_stuff'
=== renamed file 'integration-tests/run-in-image/tests/11_test_xkcd_listens' => '_integration-tests/tests/11_test_xkcd_listens'
=== renamed file 'integration-tests/run-in-image/tests/80_test_failover' => '_integration-tests/tests/80_test_failover'
=== renamed file 'integration-tests/run-in-image/tests/90_test_upgrade' => '_integration-tests/tests/90_test_upgrade'
=== renamed file 'integration-tests/run-in-image/tests/91_test_upgrade_from_stable_image' => '_integration-tests/tests/91_test_upgrade_from_stable_image'
=== renamed file 'integration-tests/run-in-image/tests/common.sh' => '_integration-tests/tests/common.sh'
=== renamed file 'integration-tests/run-in-image/tests/framework' => '_integration-tests/tests/framework'
=== renamed file 'integration-tests/run-in-image/tests/settings' => '_integration-tests/tests/settings'
=== renamed file 'debian/integration-tests/snappy_test.go' => '_integration-tests/tests/snappy_test.go'
=== modified file 'debian/integration-tests/control'
--- debian/integration-tests/control	2015-06-13 19:00:55 +0000
+++ debian/integration-tests/control	2015-06-15 15:37:42 +0000
@@ -1,5 +1,6 @@
 Test-Command: snappy.test
+Restrictions: allow-stderr
 Depends: ubuntu-snappy-tests
 
-#Test-Command: ./snappy-selftest --yes-really
-#Depends:
+Test-Command: ./_integration-tests/snappy-selftest --yes-really
+Depends:

=== modified file 'debian/rules'
--- debian/rules	2015-06-13 19:00:55 +0000
+++ debian/rules	2015-06-15 15:37:42 +0000
@@ -53,7 +53,7 @@
 
 override_dh_auto_build:
 	dh_auto_build
-	GOPATH=$$PWD/$(DH_BUILDDIR) go test -c debian/integration-tests/snappy_test.go
+	GOPATH=$$PWD/$(DH_BUILDDIR) go test -c _integration-tests/tests/snappy_test.go
 	mv snappy.test $$PWD/$(DH_BUILDDIR)/bin
 
 override_dh_auto_install:

=== removed directory 'integration-tests/debs'
=== removed directory 'integration-tests/image'
=== removed directory 'integration-tests/run-in-image'
=== removed directory 'integration-tests/run-in-image/debian'
=== removed directory 'integration-tests/run-in-image/debian/tests'
=== removed file 'integration-tests/run-in-image/debian/tests/control'
--- integration-tests/run-in-image/debian/tests/control	2015-05-20 10:23:39 +0000
+++ integration-tests/run-in-image/debian/tests/control	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-Test-Command: ./snappy-selftest --yes-really
-Depends:

=== removed directory 'integration-tests/run-in-image/tests'
=== removed file 'integration-tests/selftest'
--- integration-tests/selftest	2015-06-09 15:41:02 +0000
+++ integration-tests/selftest	1970-01-01 00:00:00 +0000
@@ -1,68 +0,0 @@
-#!/bin/sh
-
-set -ex
-
-HERE="$(dirname $0)"
-
-# build the updated deb packages for the image
-rm -f "$HERE/debs/*"
-# the "-us -uc " flags tell it not to sign it
-bzr-buildpackage --result-dir="$HERE/debs" "$HERE/.." -- -us -uc
-
-# build a base image
-IMAGE="$HERE/image/snappy.img"
-rm -f "$IMAGE/*"
-# FIXME: hrm, hrm, needs sudo to work on testbed
-#
-# FIXME2: use wget here instead and just get the latest image from
-#         cdimage
-sudo ubuntu-device-flash core -o "$IMAGE" rolling --channel edge --enable-ssh --developer-mode
-
-# base cmd
-QEMU_CMD="qemu-system-$(uname -m) -enable-kvm -m 768 -localtime -nographic -net user -net nic,model=virtio"
-
-# fire it up
-port=11022
-SERIAL=stdio
-$QEMU_CMD -drive file="$IMAGE",if=virtio -redir tcp:$port::22 -monitor none -serial $SERIAL &
-QEMU_PID=$!
-trap "kill $QEMU_PID" INT QUIT
-
-# wait until the image is ready
-SSH="ssh -oStrictHostKeyChecking=no -o UserKnownHostsFile=\"$HERE/image/known_hosts\" -p $port ubuntu@localhost"
-SCP="scp -oStrictHostKeyChecking=no -o UserKnownHostsFile=\"$HERE/image/known_hosts\" -P $port"
-for i in $(seq 100); do
-    if $SSH true; then
-        break
-    fi
-    sleep 1
-done
-if [ $i = 100 ]; then
-    echo "Failed to setup qemu"
-    exit 1
-fi
-
-# install debs
-$SSH rm -rf /tmp/debs
-$SSH mkdir /tmp/debs
-$SCP "$HERE"/debs/*.deb ubuntu@localhost:/tmp/debs
-$SSH sudo mount -o remount,rw /
-$SSH sudo dpkg -i /tmp/debs/*.deb
-
-# shut it down
-$SSH sudo halt --poweroff || true
-
-# wait for qemu pid
-for i in $(seq 100); do
-    if [ ! -e /proc/$QEMU_PID/exe ]; then
-        break
-    fi
-    i=$((i+1))
-    sleep 1
-done
-
-# now run the tests against the image
-(cd "$HERE";
- adt-run run-in-image/ --- ssh -s snappy -- -i image/snappy.img;
-)
-