Sync t/unstow_contents{,_orig}.t

This commit is contained in:
Adam Spiers 2011-11-17 19:04:10 +00:00
parent c26236d93c
commit 28dbad2933

View file

@ -136,8 +136,10 @@ make_file('../stow/pkg6b/bin6/file6');
unstow_contents_orig('../stow/pkg6b', '.'); unstow_contents_orig('../stow/pkg6b', '.');
ok( ok(
-l 'bin6/file6' && readlink('bin6/file6') eq '../../stow/pkg6a/bin6/file6' scalar(@Conflicts) == 0 &&
=> q(existing link owned by stow but points to a different package) -l 'bin6/file6' &&
readlink('bin6/file6') eq '../../stow/pkg6a/bin6/file6'
=> q(ignore existing link that points to a different package)
); );
# #
@ -244,7 +246,7 @@ unstow_contents_orig('../stow/pkg10c', '.');
stderr_like( stderr_like(
sub { process_tasks(); }, sub { process_tasks(); },
qr/There are no outstanding operations to perform/, qr/There are no outstanding operations to perform/,
'no tasks to process when unstowing pkg8a' 'no tasks to process when unstowing pkg10c'
); );
ok( ok(
scalar(@Conflicts) == 0 && scalar(@Conflicts) == 0 &&
@ -274,6 +276,7 @@ ok(
=> 'ignore temp files' => 'ignore temp files'
); );
# Todo # Todo
# #
# Test cleaning up subdirs with --paranoid option # Test cleaning up subdirs with --paranoid option