etcupdate/tests/always_test.sh

87 	# What follows are the various warning/conflict cases from the
144 	# generate a new link conflict.
152 	# This should generate a new file conflict.
190 	# to the new file if possible.  If the merge fails, a conflict
192 	# conflict case.
193 	cat > $OLD/difffiles/difffiles/difffiles/conflict <<EOF
196 	cat > $NEW/difffiles/difffiles/difffiles/conflict <<EOF
199 	cat > $TEST/difffiles/difffiles/difffiles/conflict <<EOF
206 	# /adddir/conflict: Add a new file in a directory that already
208 	mkdir $NEW/adddir/conflict
209 	touch $NEW/adddir/conflict/newfile
210 	touch $TEST/adddir/conflict
222 	# /rmdir/conflict: Do not remove a directory with a conflicted
225 		mkdir $i/rmdir/conflict
227 	mkfifo $OLD/rmdir/conflict/difftype
228 	mkdir $TEST/rmdir/conflict/difftype
248 	# /dirchange/fromdir/conflict: Convert a directory tree to a
252 		mkdir $i/dirchange/fromdir/conflict
254 	echo "foo" > $OLD/dirchange/fromdir/conflict/somefile
255 	echo "bar" > $TEST/dirchange/fromdir/conflict/somefile
256 	mkfifo $NEW/dirchange/fromdir/conflict
267 	# the conflict is due to a change in the file type.
353 # $1 - relative path to a regular file that should have a conflict
354 # $2 - optional MD5 of the conflict file contents
355 conflict()
360 		echo "File $1 missing conflict"
371 # $1 - relative path to a regular file that should not have a conflict
375 		echo "File $1 should not have a conflict"
397   C /difffiles/difffiles/difffiles/conflict
401   Modified regular file remains: /dirchange/fromdir/conflict/somefile
405   Modified directory remains: /rmdir/conflict/difftype
407   Non-empty directory remains: /rmdir/conflict
413   New link conflict: /difftype/difftype/difflinks/link ("new" vs "test")
417   Modified directory changed: /dirchange/fromdir/conflict (directory became fifo file)
421   New file mismatch: /adddir/conflict (directory vs regular file)
422   Directory mismatch: $TEST/adddir/conflict (regular file)
425   New link conflict: /second/second/difflinks/link ("new link" vs "test link")
450 conflict /second/second/difffiles/file 4f2ee8620a251fd53f06bb6112eb6ffa
463 conflict /difftype/difftype/difffiles/file 117f2bcd1f6491f6044e79e5a57a9229
481 file /difffiles/difffiles/difffiles/conflict "this is a test file"
482 conflict /difffiles/difffiles/difffiles/conflict \
485 ## /adddir/conflict:
486 file /adddir/conflict
492 ## /rmdir/conflict:
493 dir /rmdir/conflict/difftype
494 present /rmdir/conflict
500 ## /dirchange/fromdir/conflict:
501 file /dirchange/fromdir/conflict/somefile "bar"
519   U /difffiles/difffiles/difffiles/conflict
531   U /adddir/conflict
532   A /adddir/conflict/newfile
539   Modified regular file remains: /dirchange/fromdir/conflict/somefile
543   Modified directory remains: /rmdir/conflict/difftype
545   Non-empty directory remains: /rmdir/conflict
546   Modified directory changed: /dirchange/fromdir/conflict (directory became fifo file)
603 noconflict /difffiles/difffiles/difffiles/conflict
604 file /difffiles/difffiles/difffiles/conflict "this is a new file"
606 ## /adddir/conflict:
607 file /adddir/conflict/newfile
613 ## /rmdir/conflict:
614 dir /rmdir/conflict/difftype
615 present /rmdir/conflict
621 ## /dirchange/fromdir/conflict:
622 file /dirchange/fromdir/conflict/somefile "bar"