summaryrefslogtreecommitdiff
path: root/tests.branching/branch-works-anywhere.stdout
Commit message (Collapse)AuthorAgeFilesLines
* Remove tests for branch-and-merge pluginTiago Gomes2015-11-241-112/+0
| | | | Change-Id: Ie66b543eb67282c08a2651062727a4583057ee2d
* Add support for Baserock definitions version 7Sam Thursfield2015-10-141-0/+10
| | | | | | | | | | | | | | | | | | | | | | This adds a new 'Defaults' class to represent definitions defaults The Python 'jsonschema' module is used to validate the contents of the Defaults file. This module is already included in Baserock 'build' and 'devel' reference systems by way of the 'openstack-common' stratum. This commit embeds a copy of the JSON-Schema schema for the DEFAULTS file. I think the canonical location of this schema should be in the reference definitions.git, for now. In future, the schemas should maybe have their own repos. Either way, Morph should embed a copy for the time being so that we are sure the schema matches how Morph expects to parse the file. Morph's automated tests are all updated to use definitions version 7. I removed most of the tests for built-in build systems, because the built-ins themselves are no longer part of Morph. Only the mechanism for defining them needs to be tested now. Change-Id: I65f8f1c967683ef605852bfae5c68518e53f9981
* Change how MorphologyLoader instances are createdSam Thursfield2015-09-281-0/+10
| | | | | | | | | | | | | | Loading .morph files is becoming a bit more complicated, as we need to deal with the VERSION file, and possibly soon with a DEFAULTS file as well. The logic of loading and parsing .morph files is done either in the sourceresolver module, or the morphloader module. This change means that all users of the latter module can use the get hold of a MorphologyLoader instance with VERSION already parsed. If DEFAULTS is added then it is also simple to parse DEFAULTS. Change-Id: Ib33756e9dbd078e38f12dd7f776c89584b178959
* Fix paths for chunk directories in cmdtestsLars Wirzenius2014-03-061-40/+50
|
* tests: don't put cachedir in the workspaceRichard Maw2013-06-051-8/+0
| | | | | | 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.
* Avoid caching repos that are on the local machine anywaySam Thursfield2012-11-121-4/+0
| | | | | Currently the message is still displayed "Updating xxx" but no update is actually done.
* tests: Use test: URL prefix instead of baserock: throughoutSam Thursfield2012-11-071-40/+40
| | | | | | | | | | 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.
* Update the stderr and stdout files for the tests.Daniel Silverstone2012-09-141-4/+0
| | | | | | Rework the test outputs to match reality. This is due to tweaks in how morph edit/checkout gets its repository now that the copy-from-cache is marginally more like a traditional clone in terms of what you get at the end.
* Use git config to store the branch root in .morph-system-branch/configJannis Pohlmann2012-08-311-10/+10
| | | | | | | This way we can store more branch config options in the future more conveniently without having store them all in separate files or writing our own code to parse the options into a branch config object or something like that.
* Fix branch/checkout to always create branches in the workspace directoryJannis Pohlmann2012-08-301-0/+98
Doing this rather than creating the system branches in the current working directory allows "morph branch" and "morph checkout" to be run anywhere in the workspace (e.g. in a different branch). This commit also adds two tests to verify that new branches are always created in the toplevel workspace directory.