summaryrefslogtreecommitdiff
path: root/tests/bscs-merge.fail
Commit message (Collapse)AuthorAgeFilesLines
* Allow replacing a file with a compatibility symlinkSam Thursfield2014-09-196-2/+0
| | | | | | | | | | | | | This means we can do stuff like moving /etc/os-release into /usr/lib and leaving a compatibility symlink where the file was. Previously baserock-system-config-sync would fail with the following: ERROR: found two different types for 'os-release': regular and symlink One of the 'failure' test cases now passes, and I've added a specific test for our 'os-release' case to the 'symblinks' test case too.
* Remove test mode and provide hooks to use a test suite.Tiago Gomes2013-07-0118-0/+6
Tests will now be handled by a test suite in a future commit, so this mode will not be needed anymore. The test suite will work by replacing the mounting script by a fake mounting script that points to a directory with a systems folder. Also add trap again, now that it is more tested.