summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2015-09-22 16:25:24 +0000
committerBaserock Gerrit <gerrit@baserock.org>2015-09-23 14:45:06 +0000
commitb64bdc52c6158ae6aca62baaf68d8fb66687a37b (patch)
treeea167aff5ef027329dc5a85016062ae04a46e97d
parent46511c257999b1c5bdfa02a1ae7d04ee26ffee8f (diff)
downloadmorph-b64bdc52c6158ae6aca62baaf68d8fb66687a37b.tar.gz
Remove some tests which dependended on `morph foreach`
Commit a4d8098b229592db40565747b0444b518bf8a6eb removed the `morph foreach` command, which broke some `morph edit` tests. I don't think we are ready to remove `morph edit` yet (documentation still mentions it) but we can remove these tests, which require `morph foreach` to work. Change-Id: Id372760f69f31a46d1d872ee36ec6fdfb324ce34
-rwxr-xr-xtests.branching/edit-checkouts-existing-chunk.script36
-rw-r--r--tests.branching/edit-checkouts-existing-chunk.stdout11
-rwxr-xr-xtests.branching/edit-clones-chunk.script36
-rw-r--r--tests.branching/edit-clones-chunk.stdout37
4 files changed, 0 insertions, 120 deletions
diff --git a/tests.branching/edit-checkouts-existing-chunk.script b/tests.branching/edit-checkouts-existing-chunk.script
deleted file mode 100755
index 55d73bb0..00000000
--- a/tests.branching/edit-checkouts-existing-chunk.script
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2012-2015 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, see <http://www.gnu.org/licenses/>.
-
-
-## Verify that "morph edit" clones a chunk repository into a system branch.
-
-set -eu
-
-# Checkout the master system branch.
-cd "$DATADIR/workspace"
-"$SRCDIR/scripts/test-morph" init
-"$SRCDIR/scripts/test-morph" checkout test:morphs alfred
-
-# Edit the hello chunk in alfred.
-cd "alfred"
-"$SRCDIR/scripts/test-morph" edit hello
-
-echo "Current branches:"
-"$SRCDIR/scripts/test-morph" foreach git branch
-
-echo
-echo "Files in hello:"
-ls "$DATADIR/workspace/alfred/test/hello"
diff --git a/tests.branching/edit-checkouts-existing-chunk.stdout b/tests.branching/edit-checkouts-existing-chunk.stdout
deleted file mode 100644
index a859587b..00000000
--- a/tests.branching/edit-checkouts-existing-chunk.stdout
+++ /dev/null
@@ -1,11 +0,0 @@
-Current branches:
-test:hello
-* alfred
- master
-
-test:morphs
-* alfred
-
-
-Files in hello:
-dummy
diff --git a/tests.branching/edit-clones-chunk.script b/tests.branching/edit-clones-chunk.script
deleted file mode 100755
index 710565fb..00000000
--- a/tests.branching/edit-clones-chunk.script
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2012-2015 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, see <http://www.gnu.org/licenses/>.
-
-
-## Verify that "morph edit" clones a chunk repository into a system branch.
-
-set -eu
-
-# Create system branch.
-cd "$DATADIR/workspace"
-"$SRCDIR/scripts/test-morph" init
-"$SRCDIR/scripts/test-morph" branch test:morphs newbranch
-
-# Edit chunk.
-"$SRCDIR/scripts/test-morph" edit hello
-
-echo "Current branches:"
-"$SRCDIR/scripts/test-morph" foreach git branch
-
-echo
-echo "Current origins:"
-"$SRCDIR/scripts/test-morph" foreach git remote show origin | \
- sed 's,\(TMP/workspace/\.morph/cache/gits/file_\).*_,\1,g'
diff --git a/tests.branching/edit-clones-chunk.stdout b/tests.branching/edit-clones-chunk.stdout
deleted file mode 100644
index 9a62092d..00000000
--- a/tests.branching/edit-clones-chunk.stdout
+++ /dev/null
@@ -1,37 +0,0 @@
-Current branches:
-test:hello
- master
-* newbranch
-
-test:morphs
- master
-* newbranch
-
-
-Current origins:
-test:hello
-* remote origin
- Fetch URL: file://TMP/hello
- Push URL: file://TMP/hello
- HEAD branch: master
- Remote branches:
- alfred tracked
- master tracked
- Local branch configured for 'git pull':
- master merges with remote master
- Local ref configured for 'git push':
- master pushes to master (up to date)
-
-test:morphs
-* remote origin
- Fetch URL: file://TMP/morphs
- Push URL: file://TMP/morphs
- HEAD branch: master
- Remote branches:
- alfred tracked
- master tracked
- Local branch configured for 'git pull':
- master merges with remote master
- Local ref configured for 'git push':
- master pushes to master (up to date)
-