summaryrefslogtreecommitdiff
path: root/tests.merging
Commit message (Collapse)AuthorAgeFilesLines
* Tidy up command testsSam Thursfield2012-11-149-20/+37
| | | | Be consistent about placement of test description, blank lines, etc.
* Consolidate checks for python versionRichard Maw2012-11-136-30/+6
| | | | | | | | 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.
* tests: Use test: URL prefix instead of baserock: throughoutSam Thursfield2012-11-0714-64/+64
| | | | | | | | | | Some tests already used test: and in order to be able to share the scripts/setup-3rd-party-strata script they need to all use the same prefix. Using baserock: implies that we are using real code from Baserock, so I picked test: because the tests only ever use mock morphologies and no real code.
* Fix mistake in renaming tests that breaks ./check on SqueezeSam Thursfield2012-10-313-4/+4
|
* Add missing teardown script to tests.mergingSam Thursfield2012-10-311-0/+22
|
* Split merge tests out from the other branching testsSam Thursfield2012-10-2924-0/+688
Merge is by far the most complex of the branching and merging commands.