diff options
| -rw-r--r-- | morphlib/morphloader_tests.py | 10 | ||||
| -rw-r--r-- | morphlib/morphologyfactory_tests.py | 2 | ||||
| -rwxr-xr-x | tests.as-root/metadata-includes-morph-version.setup | 6 | ||||
| -rwxr-xr-x | tests.as-root/metadata-includes-repo-alias.setup | 6 | ||||
| -rwxr-xr-x | tests.as-root/setup | 14 | ||||
| -rwxr-xr-x | tests.as-root/system-overlap.script | 6 | ||||
| -rwxr-xr-x | tests.as-root/tarball-image-is-sensible.setup | 8 | ||||
| -rwxr-xr-x | tests.branching/setup | 4 | ||||
| -rwxr-xr-x | tests.build/setup | 4 | ||||
| -rwxr-xr-x | tests.build/setup-build-essential | 4 | ||||
| -rwxr-xr-x | tests.deploy/setup | 10 | ||||
| -rwxr-xr-x | tests/show-dependencies.setup | 6 | ||||
| -rw-r--r-- | yarns/implementations.yarn | 10 | ||||
| -rw-r--r-- | yarns/regression.yarn | 2 | ||||
| -rw-r--r-- | yarns/splitting.yarn | 2 |
15 files changed, 15 insertions, 79 deletions
diff --git a/morphlib/morphloader_tests.py b/morphlib/morphloader_tests.py index 39923348..bd3e77e3 100644 --- a/morphlib/morphloader_tests.py +++ b/morphlib/morphloader_tests.py @@ -382,8 +382,6 @@ build-system: dummy m['build-depends'] = [ { - "repo": "foo", - "ref": "foo", "morph": "foo", }, ] @@ -655,17 +653,19 @@ name: foo self.loader.set_defaults(m) self.loader.validate(m) self.assertEqual( - dict(m), { 'kind': 'system', 'name': 'foo', 'description': '', 'arch': 'testarch', 'strata': [ - {'morph': 'bar'}, + { + 'morph': 'bar', + }, ], 'configuration-extensions': [], - }) + }, + dict(m)) def test_unsets_defaults_for_system(self): m = morphlib.morph3.Morphology( diff --git a/morphlib/morphologyfactory_tests.py b/morphlib/morphologyfactory_tests.py index 30504e00..39092857 100644 --- a/morphlib/morphologyfactory_tests.py +++ b/morphlib/morphologyfactory_tests.py @@ -103,8 +103,6 @@ class FakeLocalRepo(object): "kind": "stratum", "build-depends": [ { - "repo": "test:repo", - "ref": "sha1", "morph": "stratum" } ], diff --git a/tests.as-root/metadata-includes-morph-version.setup b/tests.as-root/metadata-includes-morph-version.setup index f0aefb3c..31829b01 100755 --- a/tests.as-root/metadata-includes-morph-version.setup +++ b/tests.as-root/metadata-includes-morph-version.setup @@ -1,6 +1,6 @@ #!/bin/bash # -# 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 @@ -31,13 +31,9 @@ cat <<EOF > hello-tarball.morph "strata": [ { "morph": "hello-stratum", - "repo": "test:morphs", - "ref": "master" }, { "morph": "linux-stratum", - "repo": "test:morphs", - "ref": "master" } ] } diff --git a/tests.as-root/metadata-includes-repo-alias.setup b/tests.as-root/metadata-includes-repo-alias.setup index f0aefb3c..31829b01 100755 --- a/tests.as-root/metadata-includes-repo-alias.setup +++ b/tests.as-root/metadata-includes-repo-alias.setup @@ -1,6 +1,6 @@ #!/bin/bash # -# 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 @@ -31,13 +31,9 @@ cat <<EOF > hello-tarball.morph "strata": [ { "morph": "hello-stratum", - "repo": "test:morphs", - "ref": "master" }, { "morph": "linux-stratum", - "repo": "test:morphs", - "ref": "master" } ] } diff --git a/tests.as-root/setup b/tests.as-root/setup index 2ab1cd94..b865f42d 100755 --- a/tests.as-root/setup +++ b/tests.as-root/setup @@ -10,7 +10,7 @@ # The stratum repository contains a single branch, "master", with a # stratum and a system morphology that include the chunk above. # -# Copyright (C) 2011, 2012, 2013 Codethink Limited +# Copyright (C) 2011, 2012, 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 @@ -120,8 +120,6 @@ name: tools-stratum kind: stratum build-depends: - morph: linux-stratum - repo: test:morphs - ref: master chunks: - name: tools repo: test:tools-repo @@ -137,8 +135,6 @@ kind: system arch: `uname -m` strata: - morph: hello-stratum - repo: test:morphs - ref: master EOF git add hello-system.morph @@ -147,8 +143,6 @@ name: linux-stratum kind: stratum build-depends: - morph: hello-stratum - repo: test:morphs - ref: master chunks: - name: linux repo: test:kernel-repo @@ -164,14 +158,8 @@ kind: system arch: `uname -m` strata: - morph: hello-stratum - repo: test:morphs - ref: master - morph: linux-stratum - repo: test:morphs - ref: master - morph: tools-stratum - repo: test:morphs - ref: master EOF git add linux-system.morph diff --git a/tests.as-root/system-overlap.script b/tests.as-root/system-overlap.script index 41ff7536..c6154e0e 100755 --- a/tests.as-root/system-overlap.script +++ b/tests.as-root/system-overlap.script @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2011-2013 Codethink Limited +# Copyright (C) 2011-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 @@ -35,13 +35,9 @@ cat <<EOF >overlap-system.morph "strata": [ { "morph": "foo-baz-stratum", - "repo": "test:morphs", - "ref": "overlap" }, { "morph": "foo-barqux-stratum", - "repo": "test:morphs", - "ref": "overlap" } ] } diff --git a/tests.as-root/tarball-image-is-sensible.setup b/tests.as-root/tarball-image-is-sensible.setup index 5fd7b283..505707b3 100755 --- a/tests.as-root/tarball-image-is-sensible.setup +++ b/tests.as-root/tarball-image-is-sensible.setup @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (C) 2011-2013 Codethink Limited +# Copyright (C) 2011-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 @@ -50,18 +50,12 @@ cat <<EOF > hello-tarball.morph "strata": [ { "morph": "link-stratum", - "repo": "test:morphs", - "ref": "tarball-links" }, { "morph": "hello-stratum", - "repo": "test:morphs", - "ref": "tarball-links" }, { "morph": "linux-stratum", - "repo": "test:morphs", - "ref": "tarball-links" } ] } diff --git a/tests.branching/setup b/tests.branching/setup index 1263e3b6..9dfe27df 100755 --- a/tests.branching/setup +++ b/tests.branching/setup @@ -1,5 +1,5 @@ #!/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 @@ -53,8 +53,6 @@ kind: system name: hello-system strata: - morph: hello-stratum - ref: master - repo: test:morphs EOF cat <<EOF > "$DATADIR/morphs/hello-stratum.morph" diff --git a/tests.build/setup b/tests.build/setup index 563482e6..8b1dfd0e 100755 --- a/tests.build/setup +++ b/tests.build/setup @@ -10,7 +10,7 @@ # The stratum repository contains a single branch, "master", with a # stratum and a system morphology that include the chunk above. # -# Copyright (C) 2011-2013 Codethink Limited +# Copyright (C) 2011-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 @@ -111,8 +111,6 @@ cat <<EOF > hello-system.morph "strata": [ { "morph": "hello-stratum", - "repo": "test:morphs-repo", - "ref": "master" } ] } diff --git a/tests.build/setup-build-essential b/tests.build/setup-build-essential index 778716f1..5674020d 100755 --- a/tests.build/setup-build-essential +++ b/tests.build/setup-build-essential @@ -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 @@ -117,8 +117,6 @@ cat <<EOF > "hello-stratum.morph" "build-depends": [ { "morph": "build-essential", - "repo": "test:morphs-repo", - "ref": "master" } ], "chunks": [ diff --git a/tests.deploy/setup b/tests.deploy/setup index 5f83747e..5fbe0262 100755 --- a/tests.deploy/setup +++ b/tests.deploy/setup @@ -10,7 +10,7 @@ # The stratum repository contains a single branch, "master", with a # stratum and a system morphology that include the chunk above. # -# Copyright (C) 2011, 2012, 2013 Codethink Limited +# Copyright (C) 2011, 2012, 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 @@ -116,8 +116,6 @@ cat <<EOF > hello-system.morph "strata": [ { "morph": "hello-stratum", - "repo": "test:morphs", - "ref": "master" } ] } @@ -131,8 +129,6 @@ cat <<EOF > linux-stratum.morph "build-depends": [ { "morph": "hello-stratum", - "repo": "test:morphs", - "ref": "master" } ], "chunks": [ @@ -156,13 +152,9 @@ cat <<EOF > linux-system.morph "strata": [ { "morph": "hello-stratum", - "repo": "test:morphs", - "ref": "master" }, { "morph": "linux-stratum", - "repo": "test:morphs", - "ref": "master" } ], "configuration-extensions": [ diff --git a/tests/show-dependencies.setup b/tests/show-dependencies.setup index edb9b6ab..e1cc71ae 100755 --- a/tests/show-dependencies.setup +++ b/tests/show-dependencies.setup @@ -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 @@ -197,8 +197,6 @@ cat <<EOF > xfce-core.morph "build-depends": [ { "morph": "gtk-stack", - "repo": "test:test-repo", - "ref": "master" } ], "chunks": [ @@ -352,8 +350,6 @@ cat <<EOF > xfce-system.morph "arch": "$(uname -m)", "strata": [ { - "repo": "test:test-repo", - "ref": "master", "build-mode": "test", "morph": "xfce-core" } diff --git a/yarns/implementations.yarn b/yarns/implementations.yarn index b4d8e7ce..e3db6b10 100644 --- a/yarns/implementations.yarn +++ b/yarns/implementations.yarn @@ -78,8 +78,6 @@ another to hold a chunk. arch: $arch strata: - name: test-stratum - repo: test:morphs - ref: master morph: test-stratum EOF @@ -293,8 +291,6 @@ have a morphology using the test architecture. kind: stratum build-depends: - morph: build-essential - ref: master - repo: test:morphs chunks: - name: test-chunk repo: test:test-chunk @@ -312,12 +308,8 @@ have a morphology using the test architecture. name: $MATCH_1 strata: - name: build-essential - repo: test:morphs - ref: master morph: build-essential - name: core - repo: test:morphs - ref: master morph: core EOF @@ -469,8 +461,6 @@ print-architecture` to get a value appropriate for morph. name: $MATCH_1 strata: - name: test-stratum - repo: test:morphs - ref: master morph: test-stratum EOF diff --git a/yarns/regression.yarn b/yarns/regression.yarn index 71431ff7..d8eedea2 100644 --- a/yarns/regression.yarn +++ b/yarns/regression.yarn @@ -77,8 +77,6 @@ Implementations arch: $arch strata: - morph: bootstrap-stratum - repo: test:morphs - ref: master EOF cat << EOF > "$DATADIR/gits/morphs/bootstrap-stratum.morph" diff --git a/yarns/splitting.yarn b/yarns/splitting.yarn index 40da5fb4..3da397f5 100644 --- a/yarns/splitting.yarn +++ b/yarns/splitting.yarn @@ -158,8 +158,6 @@ Implementations arch: $(run_morph print-architecture) strata: - name: test-stratum - repo: test:morphs - ref: master morph: test-stratum artifacts: - test-stratum-runtime |