summaryrefslogtreecommitdiff
path: root/tests/bscs-merge.pass
Commit message (Collapse)AuthorAgeFilesLines
* Allow replacing a file with a compatibility symlinkSam Thursfield2014-09-1925-0/+24
| | | | | | | | | | | | | 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.
* Fix behaviour in bscs-merge when vUser and v2 don't have a file of v1Pedro Alvarez2014-03-051-2/+0
| | | | | If a file was removed in vUser, and v2 doesn't have a new one, then the file is not longer needed.
* Add test case for vu == v2 in 'baserock-system-config-sync'Pedro Alvarez2014-02-248-0/+16
| | | | | 'baserock-system-config-sync' is doing reverse patching when that happens. This test is to check the expected behaviour.
* Modify the way to use 'patch' in 'baserock-system-config-sync'.Pedro Alvarez2014-02-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | baserock-sytem-config-sync: Changes here are caused by a bug found in GNU patch managing the permissions of the files when using the patch command like: patch <file_to_apply_patch> -t -o <output_file> To reproduce the bug: echo foo > file1 echo bar > file2 diff -u file1 file2 | patch 1 -t -o file3 ls -l You can check that the permissions of 'file3' are different than the permissions of 'file1' or 'file2'. To avoid the bug, this patch changes the way we are using patch, using it as following: patch <file_to_apply_patch> -t Since the output file is not specified, the output file will be the file in which we want to apply the patch. And due we cannot specify the output file, we are copying the file to the destination directory, and then applying the patch there. As a consequence of changing the way of using patch, now 'patch' generates an extra file when patching fails. This file is added in the test suite also in this commit.
* Remove test mode and provide hooks to use a test suite.Tiago Gomes2013-07-01153-0/+1244
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.