diff options
author | Richard Maw <richard.maw@codethink.co.uk> | 2013-01-21 17:16:23 +0000 |
---|---|---|
committer | Richard Maw <richard.maw@codethink.co.uk> | 2013-01-21 17:27:30 +0000 |
commit | d1882582a3d0641a06f908c65de200e5b13ff5c2 (patch) | |
tree | cf80a101c822ddbf040f5f90b7169fd46e915d41 /tests.branching | |
parent | 7172dca14d7306d79e93b97dcef3a006309f2e03 (diff) | |
parent | 053c0993bb62dd5e1a73d3367ea04c70874f3bd1 (diff) | |
download | morph-d1882582a3d0641a06f908c65de200e5b13ff5c2.tar.gz |
Merge branch 'jjardon/python_compatibility_fixes' of ssh://git.baserock.org/baserock/baserock/morph
This includes the following fixups:
- altering the bootstrap script to install ordereddict and simplejson.
- Adding a comment to clarify that it is intentional to use simplejson
if collections does not have OrderedDict
- Amending the copyright years to include 2013
Diffstat (limited to 'tests.branching')
-rwxr-xr-x | tests.branching/ambiguous-refs.script | 5 | ||||
-rwxr-xr-x | tests.branching/edit-updates-stratum-build-depends.script | 5 | ||||
-rwxr-xr-x | tests.branching/edit-updates-stratum.script | 5 | ||||
-rwxr-xr-x | tests.branching/petrify-no-double-petrify.script | 5 | ||||
-rwxr-xr-x | tests.branching/petrify.script | 5 | ||||
-rwxr-xr-x | tests.branching/workflow-petrify.script | 5 |
6 files changed, 6 insertions, 24 deletions
diff --git a/tests.branching/ambiguous-refs.script b/tests.branching/ambiguous-refs.script index 0ea8a55f..cce7b52e 100755 --- a/tests.branching/ambiguous-refs.script +++ b/tests.branching/ambiguous-refs.script @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2012 Codethink Limited +# Copyright (C) 2012-2013 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 @@ -23,9 +23,6 @@ set -eu -# Disable test on versions of Python before 2.7. -. "$SRCDIR/scripts/python-check" - . "$SRCDIR/scripts/fix-committer-info" cd "$DATADIR/morphs" diff --git a/tests.branching/edit-updates-stratum-build-depends.script b/tests.branching/edit-updates-stratum-build-depends.script index 525822c9..83d5e2a4 100755 --- a/tests.branching/edit-updates-stratum-build-depends.script +++ b/tests.branching/edit-updates-stratum-build-depends.script @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2012 Codethink Limited +# Copyright (C) 2012-2013 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 @@ -20,9 +20,6 @@ set -eu -# Disable test on versions of Python before 2.7. -. "$SRCDIR/scripts/python-check" - # Add a second stratum that build-depends on the first. We can ignore the fact # that both strata contain the same chunk for this test. cd "$DATADIR/morphs" diff --git a/tests.branching/edit-updates-stratum.script b/tests.branching/edit-updates-stratum.script index c2716cab..bfe16c8b 100755 --- a/tests.branching/edit-updates-stratum.script +++ b/tests.branching/edit-updates-stratum.script @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2012 Codethink Limited +# Copyright (C) 2012-2013 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 @@ -20,9 +20,6 @@ set -eu -# Disable test on versions of Python before 2.7. -. "$SRCDIR/scripts/python-check" - # Create system branch. cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init diff --git a/tests.branching/petrify-no-double-petrify.script b/tests.branching/petrify-no-double-petrify.script index 25c977b6..c263e590 100755 --- a/tests.branching/petrify-no-double-petrify.script +++ b/tests.branching/petrify-no-double-petrify.script @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2012 Codethink Limited +# Copyright (C) 2012-2013 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 @@ -21,9 +21,6 @@ set -eu -# Disable test on versions of Python before 2.7. -. "$SRCDIR/scripts/python-check" - cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init "$SRCDIR/scripts/test-morph" branch test:morphs test/petrify diff --git a/tests.branching/petrify.script b/tests.branching/petrify.script index 6b6581d3..76c906c3 100755 --- a/tests.branching/petrify.script +++ b/tests.branching/petrify.script @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2012 Codethink Limited +# Copyright (C) 2012-2013 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 @@ -21,9 +21,6 @@ set -eu -# Disable test on versions of Python before 2.7. -. "$SRCDIR/scripts/python-check" - . "$SRCDIR/tests.branching/setup-second-chunk" cd "$DATADIR/workspace" diff --git a/tests.branching/workflow-petrify.script b/tests.branching/workflow-petrify.script index b84dd977..79279340 100755 --- a/tests.branching/workflow-petrify.script +++ b/tests.branching/workflow-petrify.script @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2012 Codethink Limited +# Copyright (C) 2012-2013 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 @@ -21,9 +21,6 @@ set -eu -# Disable test on versions of Python before 2.7. -. "$SRCDIR/scripts/python-check" - . "$SRCDIR/scripts/setup-3rd-party-strata" cd "$DATADIR/workspace" |