cmdtests: Take into account new constructed artifacts

7 files changed, 61 insertions, 25 deletions

diff --git a/tests.as-root/branch-from-image-works.script b/tests.as-root/branch-from-image-works.script
index 942301e8..c9d50bbb 100755
--- a/tests.as-root/branch-from-image-works.script
+++ b/tests.as-root/branch-from-image-works.script
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2013  Codethink Limited
+# Copyright (C) 2013-2014  Codethink Limited
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -34,7 +34,7 @@ tar -xf "$tar" -C "$extracted"
 get_sha1(){
     sed -nre '/sha1/s/^.*([0-9a-f]{40}).*$/\1/p' "$1"
 }
-hello_chunk_commit=$(get_sha1 "$extracted/baserock/hello.meta")
+hello_chunk_commit=$(get_sha1 "$extracted/baserock/hello-bins.meta")
 
 # Make a commit so that petrifying from HEAD is detectable
 chunkrepo="$DATADIR/chunk-repo"
diff --git a/tests.as-root/metadata-includes-repo-alias.script b/tests.as-root/metadata-includes-repo-alias.script
index 511222e2..9e4a5d98 100755
--- a/tests.as-root/metadata-includes-repo-alias.script
+++ b/tests.as-root/metadata-includes-repo-alias.script
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2013  Codethink Limited
+# Copyright (C) 2013-2014  Codethink Limited
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -39,11 +39,11 @@ cd "$extracted/baserock"
 
 # Check for test:morphs in System and Stratum
 #grep -q -F -e test:morphs hello-tarball.meta # tarball bug
-grep -q -F -e test:morphs hello-stratum.meta
-grep -q -F -e test:morphs linux-stratum.meta
+grep -q -F -e test:morphs hello-stratum-runtime.meta
+grep -q -F -e test:morphs linux-stratum-runtime.meta
 
 # Check for test:kernel-repo in linux
-grep -q -F -e test:kernel-repo linux.meta
+grep -q -F -e test:kernel-repo linux-misc.meta
 
 # Check for test:chunk-repo in hello
-grep -q -F -e test:chunk-repo hello.meta
+grep -q -F -e test:chunk-repo hello-bins.meta
diff --git a/tests.as-root/run-in-artifact-with-different-artifacts.script b/tests.as-root/run-in-artifact-with-different-artifacts.script
index 0016b278..ff944af4 100755
--- a/tests.as-root/run-in-artifact-with-different-artifacts.script
+++ b/tests.as-root/run-in-artifact-with-different-artifacts.script
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (C) 2012-2013  Codethink Limited
+# Copyright (C) 2012-2014  Codethink Limited
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -27,9 +27,9 @@ set -eu
     test:morphs master linux-system
 
 system=$(find "$DATADIR/cache/artifacts" -maxdepth 1 -name '*.system.*-rootfs')
-chunk=$(find "$DATADIR/cache/artifacts" -maxdepth 1 -name '*.chunk.linux')
+chunk=$(find "$DATADIR/cache/artifacts" -maxdepth 1 -name '*.chunk.linux-misc')
 stratum=$(find "$DATADIR/cache/artifacts" -maxdepth 1 \
-    -name '*.stratum.linux-stratum')
+    -name '*.stratum.linux-stratum-runtime')
 
 # Run 'run-in-artifact' with the system artifact.
 echo "System:"
diff --git a/tests.as-root/run-in-artifact-with-different-artifacts.stderr b/tests.as-root/run-in-artifact-with-different-artifacts.stderr
index 6e9a5f8f..236954f8 100644
--- a/tests.as-root/run-in-artifact-with-different-artifacts.stderr
+++ b/tests.as-root/run-in-artifact-with-different-artifacts.stderr
@@ -1 +1 @@
-ERROR: Artifact TMP/cache/artifacts/ef470cc0efd6c64992198f9d224e4b68dc452528919e2b7cf3f10efa1b88541a.stratum.linux-stratum cannot be extracted or mounted
+ERROR: Artifact TMP/cache/artifacts/4a8b7a698ae79f417b1ff1541b883bd9f99fdf287a0d1a4176e7353dbe51a5fa.stratum.linux-stratum-runtime cannot be extracted or mounted
diff --git a/tests.as-root/run-in-artifact-with-different-artifacts.stdout b/tests.as-root/run-in-artifact-with-different-artifacts.stdout
index 281ab109..7473990b 100644
--- a/tests.as-root/run-in-artifact-with-different-artifacts.stdout
+++ b/tests.as-root/run-in-artifact-with-different-artifacts.stdout
@@ -1,14 +1,32 @@
 System:
-hello-stratum.meta
-hello.meta
-linux-stratum.meta
+hello-bins.meta
+hello-devel.meta
+hello-doc.meta
+hello-libs.meta
+hello-locale.meta
+hello-misc.meta
+hello-stratum-devel.meta
+hello-stratum-runtime.meta
+linux-bins.meta
+linux-devel.meta
+linux-doc.meta
+linux-libs.meta
+linux-locale.meta
+linux-misc.meta
+linux-stratum-devel.meta
+linux-stratum-runtime.meta
 linux-system-rootfs.meta
-linux.meta
-tools-stratum.meta
-tools.meta
+tools-bins.meta
+tools-devel.meta
+tools-doc.meta
+tools-libs.meta
+tools-locale.meta
+tools-misc.meta
+tools-stratum-devel.meta
+tools-stratum-runtime.meta
 
 Chunk:
-linux.meta
+linux-misc.meta
 
 Stratum:
 Failed
diff --git a/tests.as-root/system-overlap.stdout b/tests.as-root/system-overlap.stdout
index fe106ad9..f67d54c8 100644
--- a/tests.as-root/system-overlap.stdout
+++ b/tests.as-root/system-overlap.stdout
@@ -1,3 +1,3 @@
-foo-barqux-stratum foo-baz-stratum
+foo-barqux-stratum-runtime foo-baz-stratum-runtime
 bin/foo
 bin/bar
diff --git a/tests.as-root/tarball-image-is-sensible.stdout b/tests.as-root/tarball-image-is-sensible.stdout
index c896c847..4141dee8 100644
--- a/tests.as-root/tarball-image-is-sensible.stdout
+++ b/tests.as-root/tarball-image-is-sensible.stdout
@@ -1,11 +1,29 @@
 ./baserock/
-./baserock/hello-stratum.meta
+./baserock/hello-bins.meta
+./baserock/hello-devel.meta
+./baserock/hello-doc.meta
+./baserock/hello-libs.meta
+./baserock/hello-locale.meta
+./baserock/hello-misc.meta
+./baserock/hello-stratum-devel.meta
+./baserock/hello-stratum-runtime.meta
 ./baserock/hello-tarball-rootfs.meta
-./baserock/hello.meta
-./baserock/link-stratum.meta
-./baserock/links.meta
-./baserock/linux-stratum.meta
-./baserock/linux.meta
+./baserock/link-stratum-devel.meta
+./baserock/link-stratum-runtime.meta
+./baserock/links-bins.meta
+./baserock/links-devel.meta
+./baserock/links-doc.meta
+./baserock/links-libs.meta
+./baserock/links-locale.meta
+./baserock/links-misc.meta
+./baserock/linux-bins.meta
+./baserock/linux-devel.meta
+./baserock/linux-doc.meta
+./baserock/linux-libs.meta
+./baserock/linux-locale.meta
+./baserock/linux-misc.meta
+./baserock/linux-stratum-devel.meta
+./baserock/linux-stratum-runtime.meta
 ./bin/
 ./bin/hello*
 ./bin/true