summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <lars.wirzenius@codethink.co.uk>2014-03-10 19:04:19 +0000
committerLars Wirzenius <lars.wirzenius@codethink.co.uk>2014-03-10 19:04:19 +0000
commit4abbd9f8c01301f62ed8817d2e31fadcde1bffda (patch)
treed5729df98f147dae1589dd892a5651f72083dad2
parent958cb4b614e3ac47332148ecbd15e5c2e3e07db3 (diff)
parentbd3208b38f99d6fd95330c9aea6862d9dedbfc50 (diff)
downloadmorph-4abbd9f8c01301f62ed8817d2e31fadcde1bffda.tar.gz
Merge remote-tracking branch 'origin/sam/deploy-test-fix'
-rwxr-xr-xtests.deploy/deploy-cluster.script10
-rw-r--r--tests.deploy/deploy-cluster.stdout2
2 files changed, 4 insertions, 8 deletions
diff --git a/tests.deploy/deploy-cluster.script b/tests.deploy/deploy-cluster.script
index 0659ad21..acc65a54 100755
--- a/tests.deploy/deploy-cluster.script
+++ b/tests.deploy/deploy-cluster.script
@@ -20,12 +20,6 @@
set -eu
-# DISABLED TEST: This does not seem to have been tested at merge time,
-# in a clean repository. The tests produces output (see below for
-# definitions-version), but the expected output is empty.
-# FIXME: This should be fixed.
-exit
-
. "$SRCDIR/tests.deploy/setup-build"
cd "$DATADIR/workspace/branch1"
@@ -34,7 +28,7 @@ cd "$DATADIR/workspace/branch1"
"$SRCDIR/scripts/test-morph" build linux-system
-GIT_DIR=test:morphs/.git git tag -a my-test-tag -m "Example tag" HEAD
+GIT_DIR=test/morphs/.git git tag -a my-test-tag -m "Example tag" HEAD
"$SRCDIR/scripts/test-morph" --log "$DATADIR/deploy.log" \
deploy test_cluster \
@@ -42,7 +36,7 @@ GIT_DIR=test:morphs/.git git tag -a my-test-tag -m "Example tag" HEAD
linux-system-2.HOSTNAME="baserock-rocks-even-more" \
> /dev/null
-outputdir=test:morphs
+outputdir=test/morphs
test -e $outputdir/hello-system.img
test -e $outputdir/linux-system-1.tar
test -e $outputdir/linux-system-2.tar
diff --git a/tests.deploy/deploy-cluster.stdout b/tests.deploy/deploy-cluster.stdout
new file mode 100644
index 00000000..16b78015
--- /dev/null
+++ b/tests.deploy/deploy-cluster.stdout
@@ -0,0 +1,2 @@
+definitions-version: {'describe': 'my-test-tag-unreproducible'}
+configuration.HOSTNAME: baserock-rocks-even-more