From b64bdc52c6158ae6aca62baaf68d8fb66687a37b Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Tue, 22 Sep 2015 16:25:24 +0000 Subject: 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 --- .../edit-checkouts-existing-chunk.script | 36 --------------------- .../edit-checkouts-existing-chunk.stdout | 11 ------- tests.branching/edit-clones-chunk.script | 36 --------------------- tests.branching/edit-clones-chunk.stdout | 37 ---------------------- 4 files changed, 120 deletions(-) delete mode 100755 tests.branching/edit-checkouts-existing-chunk.script delete mode 100644 tests.branching/edit-checkouts-existing-chunk.stdout delete mode 100755 tests.branching/edit-clones-chunk.script delete mode 100644 tests.branching/edit-clones-chunk.stdout 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 . - - -## 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 . - - -## 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) - -- cgit v1.2.1