diff options
author | Richard Maw <richard.maw@codethink.co.uk> | 2012-11-13 15:45:40 +0000 |
---|---|---|
committer | Richard Maw <richard.maw@codethink.co.uk> | 2012-11-13 16:15:04 +0000 |
commit | 75453f4ce61e6ad9e44b39c3681b5ede133af447 (patch) | |
tree | 0197190e5cbacd76efd08c464a807a78a2fbf08e /tests.branching | |
parent | 2ac6f661130322e63b8d2737145ea11d445aaa79 (diff) | |
download | morph-75453f4ce61e6ad9e44b39c3681b5ede133af447.tar.gz |
Consolidate checks for python version
Most of the bespoke logic for the version check is unnecessary,
since the output to display can be easily inferred from the filename.
This fixes some test failures where the version check would cat a
file to fake the output, but fail because the file was removed.
Diffstat (limited to 'tests.branching')
-rwxr-xr-x | tests.branching/ambiguous-refs.script | 9 | ||||
-rwxr-xr-x | tests.branching/edit-updates-stratum.script | 6 | ||||
-rwxr-xr-x | tests.branching/petrify-no-double-petrify.script | 7 | ||||
-rwxr-xr-x | tests.branching/petrify.script | 6 | ||||
-rwxr-xr-x | tests.branching/workflow-petrify.script | 6 |
5 files changed, 7 insertions, 27 deletions
diff --git a/tests.branching/ambiguous-refs.script b/tests.branching/ambiguous-refs.script index 9da776fd..3b2ec5e8 100755 --- a/tests.branching/ambiguous-refs.script +++ b/tests.branching/ambiguous-refs.script @@ -20,13 +20,10 @@ set -eu -. "$SRCDIR/scripts/fix-committer-info" - # Disable test on versions of Python before 2.7. -if ! python --version 2>&1 | grep '^Python 2\.[78]' > /dev/null -then - exit 0 -fi +. "$SRCDIR/scripts/python-check" + +. "$SRCDIR/scripts/fix-committer-info" cd "$DATADIR/morphs" git mv hello-stratum.morph goodbye-stratum.morph diff --git a/tests.branching/edit-updates-stratum.script b/tests.branching/edit-updates-stratum.script index d43fd360..8b6af1d1 100755 --- a/tests.branching/edit-updates-stratum.script +++ b/tests.branching/edit-updates-stratum.script @@ -21,11 +21,7 @@ set -eu # Disable test on versions of Python before 2.7. -if ! python --version 2>&1 | grep '^Python 2\.[78]' > /dev/null -then - cat "$SRCDIR/tests.branching/edit-updates-stratum.stdout" - exit 0 -fi +. "$SRCDIR/scripts/python-check" # Create system branch. cd "$DATADIR/workspace" diff --git a/tests.branching/petrify-no-double-petrify.script b/tests.branching/petrify-no-double-petrify.script index 56326cdc..1b5289c4 100755 --- a/tests.branching/petrify-no-double-petrify.script +++ b/tests.branching/petrify-no-double-petrify.script @@ -22,12 +22,7 @@ set -eu # Disable test on versions of Python before 2.7. -if ! python --version 2>&1 | grep '^Python 2\.[78]' > /dev/null -then - cat "$SRCDIR/tests.branching/petrify-no-double-petrify.stdout" - exit 0 -fi - +. "$SRCDIR/scripts/python-check" cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init diff --git a/tests.branching/petrify.script b/tests.branching/petrify.script index a74ae6ba..0fb4a4c4 100755 --- a/tests.branching/petrify.script +++ b/tests.branching/petrify.script @@ -23,11 +23,7 @@ set -eu # Disable test on versions of Python before 2.7. -if ! python --version 2>&1 | grep '^Python 2\.[78]' > /dev/null -then - cat "$SRCDIR/tests.branching/petrify.stdout" - exit 0 -fi +. "$SRCDIR/scripts/python-check" . "$SRCDIR/tests.branching/setup-second-chunk" diff --git a/tests.branching/workflow-petrify.script b/tests.branching/workflow-petrify.script index a73e17db..35643012 100755 --- a/tests.branching/workflow-petrify.script +++ b/tests.branching/workflow-petrify.script @@ -22,11 +22,7 @@ set -eu # Disable test on versions of Python before 2.7. -if ! python --version 2>&1 | grep '^Python 2\.[78]' > /dev/null -then - cat "$SRCDIR/tests.branching/workflow-petrify.stdout" - exit 0 -fi +. "$SRCDIR/scripts/python-check" . "$SRCDIR/scripts/setup-3rd-party-strata" |