Add cmdtest for "morph deploy" and rawdisk.write

5 files changed, 278 insertions, 5 deletions

diff --git a/check b/check
index 22db382b..67b4ce34 100755
--- a/check
+++ b/check
@@ -23,6 +23,7 @@ python setup.py clean check
 cmdtest tests
 cmdtest tests.branching
 cmdtest tests.merging
+cmdtest tests.deploy
 if [ $(whoami) = root ] && command -v mkfs.btrfs > /dev/null &&
     python -c "
 import morphlib, sys
diff --git a/morphlib/plugins/deploy_plugin.py b/morphlib/plugins/deploy_plugin.py
index 89f7ed07..eff1377c 100644
--- a/morphlib/plugins/deploy_plugin.py
+++ b/morphlib/plugins/deploy_plugin.py
@@ -20,6 +20,7 @@ import os
 import shutil
 import tarfile
 import tempfile
+import urlparse
 import uuid
 
 import morphlib
@@ -34,6 +35,7 @@ class DeployPlugin(cliapp.Plugin):
             arg_synopsis='TYPE SYSTEM LOCATION [KEY=VALUE]')
         self.other = \
             morphlib.plugins.branch_and_merge_plugin.BranchAndMergePlugin()
+        self.other.app = self.app
 
     def disable(self):
         pass
@@ -134,7 +136,7 @@ class DeployPlugin(cliapp.Plugin):
             names = m['configuration-extensions']
             for name in names:
                 self._run_extension(
-                    build_branch_root,
+                    branch_dir,
                     build_ref,
                     name,
                     '.configure',
@@ -144,9 +146,9 @@ class DeployPlugin(cliapp.Plugin):
         # Run write extension.
         self.app.status(msg='Writing to device')
         self._run_extension(
-            build_branch_root,
+            branch_dir,
             build_ref,
-            name,
+            deployment_type,
             '.write',
             [system_tree, location],
             env)
@@ -174,7 +176,7 @@ class DeployPlugin(cliapp.Plugin):
             ext_filename = os.path.join(code_dir, 'exts', name + kind)
             if not os.path.exists(ext_filename):
                 raise morphlib.Error(
-                    'Could not find extenstion %s%s' % (name, kind))
+                    'Could not find extension %s%s' % (name, kind))
             delete_ext = False
         else:
             fd, ext_filename = tempfile.mkstemp()
@@ -192,7 +194,7 @@ class DeployPlugin(cliapp.Plugin):
     def _cat_file(self, repo_dir, ref, pathname):
         '''Retrieve contents of a file from a git repository.'''
         
-        argv = ['git', 'cat-file', 'blob', '%s:%s' % (ref, filename)]
+        argv = ['git', 'cat-file', 'blob', '%s:%s' % (ref, pathname)]
         try:
             return self.app.runcmd(argv, cwd=repo_dir)
         except cliapp.AppException:
diff --git a/tests.deploy/deploy-rawdisk.script b/tests.deploy/deploy-rawdisk.script
new file mode 100755
index 00000000..4c01ca0d
--- /dev/null
+++ b/tests.deploy/deploy-rawdisk.script
@@ -0,0 +1,31 @@
+#!/bin/sh
+#
+# Copyright (C) 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
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+
+# Test "morph deploy" by deploying to a raw disk image.
+
+
+set -eu
+
+
+. "$SRCDIR/tests.as-root/setup-build"
+cd "$DATADIR/workspace/branch1"
+"$SRCDIR/scripts/test-morph" build linux-system
+"$SRCDIR/scripts/test-morph" --log "$DATADIR/deploy.log" \
+    deploy rawdisk linux-system "$DATADIR/disk.img" > /dev/null
+[ -e "$DATADIR/disk.img" ]
+
diff --git a/tests.deploy/setup b/tests.deploy/setup
new file mode 100755
index 00000000..1065849d
--- /dev/null
+++ b/tests.deploy/setup
@@ -0,0 +1,204 @@
+#!/bin/bash
+#
+# Create git repositories for tests. The chunk repository will contain a 
+# simple "hello, world" C program, and two branches ("master", "farrokh"), 
+# with the master branch containing just a README. The two branches are there
+# so that we can test building a branch that hasn't been checked out.
+# The branches are different so that we know that if the wrong branch
+# is uses, the build will fail.
+#
+# 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
+# 
+# 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
+# the Free Software Foundation; version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+
+set -eu
+
+source "$SRCDIR/scripts/fix-committer-info"
+
+# The $DATADIR should be empty at the beginnig of each test.
+find "$DATADIR" -mindepth 1 -delete
+
+# Create an empty directory to be used as a morph workspace
+mkdir "$DATADIR/workspace"
+
+# Create chunk repository.
+
+chunkrepo="$DATADIR/chunk-repo"
+mkdir "$chunkrepo"
+cd "$chunkrepo"
+git init --quiet
+
+cat <<EOF > README
+This is a sample README.
+EOF
+git add README
+git commit --quiet -m "add README"
+
+git checkout --quiet -b farrokh
+
+cat <<EOF > hello.c
+#include <stdio.h>
+int main(void)
+{
+    puts("hello, world");
+    return 0;
+}
+EOF
+git add hello.c
+
+cat <<EOF > hello.morph
+{
+    "name": "hello",
+    "kind": "chunk",
+    "build-system": "dummy",
+    "build-commands": [
+        "gcc -o hello hello.c"
+    ],
+    "install-commands": [
+        "install -d \\"\$DESTDIR\\"/etc",
+        "install -d \\"\$DESTDIR\\"/bin",
+        "install hello \\"\$DESTDIR\\"/bin/hello"
+    ]
+}
+EOF
+git add hello.morph
+
+git commit --quiet -m "add a hello world program and morph"
+
+git checkout --quiet master
+
+
+
+# Create morph repository.
+
+morphsrepo="$DATADIR/morphs"
+mkdir "$morphsrepo"
+cd "$morphsrepo"
+git init --quiet
+
+cat <<EOF > hello-stratum.morph
+{
+    "name": "hello-stratum",
+    "kind": "stratum",
+    "chunks": [
+        {
+            "name": "hello",
+            "repo": "test:chunk-repo",
+            "ref": "farrokh",
+            "build-depends": []
+        }
+    ]
+}
+EOF
+git add hello-stratum.morph
+
+cat <<EOF > hello-system.morph
+{
+    "name": "hello-system",
+    "kind": "system",
+    "system-kind": "rootfs-tarball",
+    "arch": "$(uname -m)",
+    "strata": [
+        {
+            "morph": "hello-stratum",
+            "repo": "test:morphs",
+            "ref": "master"
+        }
+    ]
+}
+EOF
+git add hello-system.morph
+
+cat <<EOF > linux-stratum.morph
+{
+    "name": "linux-stratum",
+    "kind": "stratum",
+    "build-depends": [
+        {
+            "morph": "hello-stratum",
+            "repo": "test:morphs",
+            "ref": "master"
+        }
+    ],
+    "chunks": [
+        {
+            "name": "linux",
+            "repo": "test:kernel-repo",
+            "ref": "master",
+            "build-depends": []
+        }
+    ]
+}
+EOF
+git add linux-stratum.morph
+
+cat <<EOF > linux-system.morph
+{
+    "name": "linux-system",
+    "kind": "system",
+    "system-kind": "rootfs-tarball",
+    "arch": "$(uname -m)",
+    "strata": [
+        {
+            "morph": "hello-stratum",
+            "repo": "test:morphs",
+            "ref": "master"
+        },
+        {
+            "morph": "linux-stratum",
+            "repo": "test:morphs",
+            "ref": "master"
+        }
+    ]
+}
+EOF
+git add linux-system.morph
+
+git commit --quiet -m "add morphs"
+
+# Make a dummy kernel chunk.
+mkdir "$DATADIR/kernel-repo"
+cat <<EOF > "$DATADIR/kernel-repo/linux.morph"
+{
+    "name": "linux",
+    "kind": "chunk",
+    "install-commands": [
+        "mkdir -p \"\$DESTDIR/boot\"",
+        "touch \"\$DESTDIR\"/extlinux.conf",
+        "touch \"\$DESTDIR\"/boot/vmlinuz",
+        "touch \"\$DESTDIR\"/boot/System.map"
+    ]
+}
+EOF
+"$SRCDIR/scripts/run-git-in" "$DATADIR/kernel-repo" init --quiet
+"$SRCDIR/scripts/run-git-in" "$DATADIR/kernel-repo" add .
+"$SRCDIR/scripts/run-git-in" "$DATADIR/kernel-repo" commit --quiet -m foo \
+    > /dev/null
+
+# Create a morph configuration file.
+cat <<EOF > "$DATADIR/morph.conf"
+[config]
+repo-alias = test=file://$DATADIR/#file://$DATADIR/
+cachedir = $DATADIR/cache
+log = $DATADIR/morph.log
+keep-path = true
+no-distcc = true
+quiet = true
+log = /tmp/morph.log
+EOF
+
diff --git a/tests.deploy/setup-build b/tests.deploy/setup-build
new file mode 100644
index 00000000..6c0a6252
--- /dev/null
+++ b/tests.deploy/setup-build
@@ -0,0 +1,35 @@
+#!/bin/bash
+#
+# Copyright (C) 2012, 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
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+
+## Fixture for tests involving 'morph build'
+
+source "$SRCDIR/scripts/fix-committer-info"
+
+cd "$DATADIR/workspace"
+"$SRCDIR/scripts/test-morph" init
+"$SRCDIR/scripts/test-morph" branch test:morphs branch1
+"$SRCDIR/scripts/test-morph" edit linux-system linux-stratum linux
+
+# Fix UUID's in the checked out repos to make build branch names deterministic
+git config -f "$DATADIR/workspace/branch1/.morph-system-branch/config" \
+    branch.uuid 123456789
+git config -f "$DATADIR/workspace/branch1/test:morphs/.git/config" \
+    morph.uuid 987654321
+git config -f "$DATADIR/workspace/branch1/test:kernel-repo/.git/config" \
+    morph.uuid AABBCCDDE
+