From bd3208b38f99d6fd95330c9aea6862d9dedbfc50 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Tue, 11 Mar 2014 10:23:53 +0000 Subject: tests: Fix tests.deploy/deploy-cluster My fault for failing to commit the .stdout file when I updated the test. --- tests.deploy/deploy-cluster.script | 10 ++-------- tests.deploy/deploy-cluster.stdout | 2 ++ 2 files changed, 4 insertions(+), 8 deletions(-) create mode 100644 tests.deploy/deploy-cluster.stdout 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 -- cgit v1.2.1