From 848118b07b38a534bd0b53a8d972001a5fb22777 Mon Sep 17 00:00:00 2001
From: Richard Maw <richard.maw@codethink.co.uk>
Date: Thu, 19 Dec 2013 15:23:51 +0000
Subject: yarns: Add a deploy test

---
 yarns/deployment.yarn      |  9 +++++++++
 yarns/implementations.yarn | 43 ++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/yarns/deployment.yarn b/yarns/deployment.yarn
index 35f933b7..855ecc52 100644
--- a/yarns/deployment.yarn
+++ b/yarns/deployment.yarn
@@ -8,3 +8,12 @@ Morph Deployment Tests
     AND the user attempts to deploy the system test-system in branch master
     THEN morph failed
     AND the deploy error message includes the string "morph deploy is only supported for cluster morphologies"
+
+    SCENARIO deploying a cluster morphology
+    GIVEN a workspace
+    AND a git server
+    WHEN the user checks out the system branch called master
+    GIVEN a cluster called test-cluster for deploying only the test-system system as type tar in system branch master
+    WHEN the user builds the system test-system in branch master
+    AND the user attempts to deploy the cluster test-cluster in branch master with options system.location=test.tar
+    THEN morph succeeded
diff --git a/yarns/implementations.yarn b/yarns/implementations.yarn
index 60e1dda1..083035fe 100644
--- a/yarns/implementations.yarn
+++ b/yarns/implementations.yarn
@@ -30,6 +30,14 @@ we can test it later in a THEN step.
         0) die "Morph should have failed, but didn't. Unexpected success!" ;;
     esac
 
+    IMPLEMENTS THEN morph succeeded
+    case $(cat "$DATADIR/morph-exit") in
+    0)  echo "Morph succeeded!"
+        ;;
+    *)  die "Morph should have succeeded, but didn't. Unexpected failure!"
+        ;;
+    esac
+
 We need to check that a workspace creation worked. This requires the
 directory to exist, and its `.morph` subdirectory to exist, and nothing
 else.
@@ -656,11 +664,40 @@ Implementation sections for cross-bootstraping
 Implementation sections for deployment
 ======================================
 
-    IMPLEMENTS WHEN the user (attempts to deploy|deploys) the (system|cluster) (\S+) in branch (\S+)
+Defaults are set in the cluster morphology, so we can deploy without
+setting any extra parameters, but we also need to be able to override
+them, so they can be added to the end of the implements section.
+
+    IMPLEMENTS WHEN the user (attempts to deploy|deploys) the (system|cluster) (\S+) in branch (\S+)( with options (.*))?
     cd "$DATADIR/workspace/$MATCH_4"
-    set build "$MATCH_3"
+    set -- deploy "$MATCH_3"
+    if [ "$MATCH_5" != '' ]; then
+        # eval used so word splitting in the text is preserved
+        eval set -- '"$@"' $MATCH_6
+    fi
     if [ $MATCH_1 == "deploys" ]; then run_morph "$@"
-    else attempt_morph deploy "$MATCH_3"; fi
+    else attempt_morph "$@"; fi
+
+To successfully deploy systems, we need a cluster morphology. Since the
+common case is to just have one system, we generate a stub morphology
+with only the minimal information.
+
+    IMPLEMENTS GIVEN a cluster called (\S+) for deploying only the (\S+) system as type (\S+) in system branch (\S+)
+    name="$MATCH_1"
+    system="$MATCH_2"
+    type="$MATCH_3"
+    branch="$MATCH_4"
+    cat << EOF > "$DATADIR/workspace/$branch/test:morphs/$name.morph"
+    name: $name
+    kind: cluster
+    systems:
+    - morph: $system
+      repo: test:morphs
+      ref: $branch
+      deploy:
+        system:
+          type: $type
+    EOF
 
 Implementations sections for reading error messages
 ===================================================
-- 
cgit v1.2.1