Merge remote-tracking branch 'origin/danielfirth/RT189'

Changed the error (exception) to list all obsolete fields.

7 files changed, 1 insertions, 14 deletions

diff --git a/tests.as-root/archless-system-fails.script b/tests.as-root/archless-system-fails.script
index eda797f1..2fdeb018 100755
--- a/tests.as-root/archless-system-fails.script
+++ b/tests.as-root/archless-system-fails.script
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2011, 2012  Codethink Limited
+# Copyright (C) 2011-2013  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
@@ -26,7 +26,6 @@ cat <<EOF >archless-system.morph
 {
   "name": "archless-system",
   "kind": "system",
-  "disk-size": "1G",
   "strata": [
     {
       "morph": "hello-stratum",
diff --git a/tests.as-root/metadata-includes-morph-version.setup b/tests.as-root/metadata-includes-morph-version.setup
index 2284cfb9..f0aefb3c 100755
--- a/tests.as-root/metadata-includes-morph-version.setup
+++ b/tests.as-root/metadata-includes-morph-version.setup
@@ -27,7 +27,6 @@ cat <<EOF > hello-tarball.morph
 {
     "name": "hello-tarball",
     "kind": "system",
-    "system-kind": "rootfs-tarball",
     "arch": "$(uname -m)",
     "strata": [
         {
diff --git a/tests.as-root/metadata-includes-repo-alias.setup b/tests.as-root/metadata-includes-repo-alias.setup
index 2284cfb9..f0aefb3c 100755
--- a/tests.as-root/metadata-includes-repo-alias.setup
+++ b/tests.as-root/metadata-includes-repo-alias.setup
@@ -27,7 +27,6 @@ cat <<EOF > hello-tarball.morph
 {
     "name": "hello-tarball",
     "kind": "system",
-    "system-kind": "rootfs-tarball",
     "arch": "$(uname -m)",
     "strata": [
         {
diff --git a/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script b/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script
index 8229127d..93cd135f 100755
--- a/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script
+++ b/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script
@@ -16,9 +16,6 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 
-## A system-kind of rootfs-tarball should build both kernel image and
-## a tarball with the root filesystem.
-
 set -eu
 
 # Disable test on versions of Python before 2.7.
diff --git a/tests.as-root/setup b/tests.as-root/setup
index eea9e061..2ab1cd94 100755
--- a/tests.as-root/setup
+++ b/tests.as-root/setup
@@ -134,9 +134,7 @@ git add tools-stratum.morph
 cat <<EOF > hello-system.morph
 name: hello-system
 kind: system
-system-kind: rootfs-tarball
 arch: `uname -m`
-disk-size: 1G
 strata:
     - morph: hello-stratum
       repo: test:morphs
@@ -163,9 +161,7 @@ git add linux-stratum.morph
 cat <<EOF > linux-system.morph
 name: linux-system
 kind: system
-system-kind: rootfs-tarball
 arch: `uname -m`
-disk-size: 1G
 strata:
     - morph: hello-stratum
       repo: test:morphs
diff --git a/tests.as-root/system-overlap.script b/tests.as-root/system-overlap.script
index 6e6ef2ac..41ff7536 100755
--- a/tests.as-root/system-overlap.script
+++ b/tests.as-root/system-overlap.script
@@ -31,9 +31,7 @@ cat <<EOF >overlap-system.morph
 {
   "name": "overlap-system",
   "kind": "system",
-  "system-kind": "rootfs-tarball",
   "arch": "$(uname -m)",
-  "disk-size": "1G",
   "strata": [
     {
       "morph": "foo-baz-stratum",
diff --git a/tests.as-root/tarball-image-is-sensible.setup b/tests.as-root/tarball-image-is-sensible.setup
index fa904c2c..5fd7b283 100755
--- a/tests.as-root/tarball-image-is-sensible.setup
+++ b/tests.as-root/tarball-image-is-sensible.setup
@@ -46,7 +46,6 @@ cat <<EOF > hello-tarball.morph
 {
     "name": "hello-tarball",
     "kind": "system",
-    "system-kind": "rootfs-tarball",
     "arch": "$(uname -m)",
     "strata": [
         {