summaryrefslogtreecommitdiff
path: root/tests.merging
Commit message (Collapse)AuthorAgeFilesLines
* Dropped support for 'system-kind' from system morphology filesDan Firth2013-09-271-1/+0
|
* Dropped support for 'disk-size' from system morphology files'Dan Firth2013-09-271-1/+0
|
* Revert "Merge branch 'liw/restore-old-cmds'"Richard Maw2013-08-292-3/+3
| | | | | | | | | | | | | | | This reverts commit 2dc382a2a9ae977b1158002cd2631ec5593959c1, reversing changes made to 89a019af088ff62459699a6efdadf8ac8fe35dd9. We decided to restore the old commands for the release, as we weren't confident the new implementations were correct yet. To gain that confidence we need to use them, so the old versions are no longer available, and the new edit code is used when the edit subcommand is invoked. Doing so also requires the test suite to use the edit command instead of new-edit.
* Use new edit instead of old one in testsLars Wirzenius2013-08-192-3/+3
| | | | | | | The test suite got adapted so it requires the new edit instead of the old one. So use the new edit instead of the old one in the test. This is a kluge, and needs to be reverted after the BR10 release.
* tests: don't put cachedir in the workspaceRichard Maw2013-06-051-1/+1
| | | | | | This was a wild idea when we first designed the branch structure. It causes more problems than it's worth as you may have multiple workspaces, and it needed to be set manually in the first place.
* Fix tests to use rootfs-tarball system-kinds, instead of disksLars Wirzenius2013-04-232-2/+2
|
* Remove features used by old bootstrap methodSam Thursfield2013-03-131-2/+1
| | | | | | That means that bootstrapping Baserock is currently not possible with this branch of Morph, but there's no reason it cannot be bootstrapped using an older version of Morph instead.
* Merge branch 'jjardon/python_compatibility_fixes' of ↵Richard Maw2013-01-216-24/+6
|\ | | | | | | | | | | | | | | | | | | 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
| * tests.merging/*: Remove check to run only the teset with Python 2.7Javier Jardón2013-01-186-18/+0
|/ | | | | As we use ordererdict for python < 2.7 as well See 37f8d84d7ab356169bf7c04bdecb39a61b85c88d
* 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.
View Lorry Controller Status