summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Coldrick <adam.coldrick@codethink.co.uk>2015-01-14 12:38:58 +0000
committerAdam Coldrick <adam.coldrick@codethink.co.uk>2015-01-22 16:29:25 +0000
commit9e30d7f57859061afc9f8b1af7f9a40b367bbca2 (patch)
treec7a9a766b937301b2da61fcf9fb40bef9cf7049e
parentf2f3e4e5f3d5162890d03494f405cff5177aaad8 (diff)
downloadmorph-9e30d7f57859061afc9f8b1af7f9a40b367bbca2.tar.gz
Fix some yarns to shut down their git servers when finished
This commit fixes an issue where running morph's yarn tests would leave behind a number of scripts/git-daemon-wrap processes due to some tests not stopping their git server properly.
-rw-r--r--yarns/branches-workspaces.yarn1
-rw-r--r--yarns/building.yarn1
-rw-r--r--yarns/deployment.yarn1
3 files changed, 3 insertions, 0 deletions
diff --git a/yarns/branches-workspaces.yarn b/yarns/branches-workspaces.yarn
index 34aa97e0..a757822e 100644
--- a/yarns/branches-workspaces.yarn
+++ b/yarns/branches-workspaces.yarn
@@ -233,6 +233,7 @@ build branch is made to include that change.
WHEN the user makes changes to test-chunk in branch master
AND the user builds systems/test-system.morph of the master branch
THEN the changes to test-chunk in branch master are included in the temporary build branch
+ FINALLY the git server is shut down
### When branches are created ###
diff --git a/yarns/building.yarn b/yarns/building.yarn
index 253b3b3c..ff22424c 100644
--- a/yarns/building.yarn
+++ b/yarns/building.yarn
@@ -35,6 +35,7 @@ so when we deploy the system, we can check whether it exists.
WHEN the user attempts to deploy the cluster test-cluster.morph in branch master with options test-system.location="$DATADIR/test.tar"
THEN morph succeeded
AND tarball test.tar contains etc/passwd
+ FINALLY the git server is shut down
Distbuilding
------------
diff --git a/yarns/deployment.yarn b/yarns/deployment.yarn
index 0782c7c1..9814f87d 100644
--- a/yarns/deployment.yarn
+++ b/yarns/deployment.yarn
@@ -328,3 +328,4 @@ Once it is rebuilt, it can be deployed.
WHEN the user attempts to deploy the cluster test-cluster.morph in branch mybranch
THEN morph succeeded
AND file workspace/mybranch/test/morphs/test-system.tar exists
+ FINALLY the git server is shut down