diff options
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" |