00dani/stow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rename $OUT_DIR to $TEST_DIR

Browse source 
This is a more accurate reflection of what it is.
This commit is contained in:
Adam Spiers 2019-06-28 00:53:12 +01:00
parent 5f875009f8
commit ba48fd3908
14 changed files with 102 additions and 102 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
t/chkstow.t
View file

@ -30,7 +30,7 @@ use Test::Output;
use English qw(-no_match_vars); use English qw(-no_match_vars);
init_test_dirs(); init_test_dirs();
cd("$OUT_DIR/target"); cd("$TEST_DIR/target");
# setup stow directory # setup stow directory
make_dir('stow'); make_dir('stow');

2
t/cleanup_invalid_links.t
View file

@ -28,7 +28,7 @@ use English qw(-no_match_vars);
use testutil; use testutil;
init_test_dirs(); init_test_dirs();
cd("$OUT_DIR/target"); cd("$TEST_DIR/target");
my $stow; my $stow;

14
t/cli_options.t
View file

@ -32,15 +32,15 @@ init_test_dirs();
local @ARGV = ( local @ARGV = (
'-v', '-v',
'-d', "$OUT_DIR/stow", '-d', "$TEST_DIR/stow",
'-t', "$OUT_DIR/target", '-t', "$TEST_DIR/target",
'dummy' 'dummy'
); );
my ($options, $pkgs_to_delete, $pkgs_to_stow) = process_options(); my ($options, $pkgs_to_delete, $pkgs_to_stow) = process_options();
is($options->{verbose}, 1, 'verbose option'); is($options->{verbose}, 1, 'verbose option');
is($options->{dir}, "$OUT_DIR/stow", 'stow dir option'); is($options->{dir}, "$TEST_DIR/stow", 'stow dir option');
my $stow = new_Stow(%$options); my $stow = new_Stow(%$options);
@ -101,12 +101,12 @@ is_deeply($options->{ignore}, [ qr(~\z), qr(\.#.*\z) ] => 'ignore temp files');
# Check that expansion not applied. # Check that expansion not applied.
# #
local @ARGV = ( local @ARGV = (
"--target=$OUT_DIR/".'$HOME', "--target=$TEST_DIR/".'$HOME',
'dummy' 'dummy'
); );
make_dir("$OUT_DIR/".'$HOME'); make_dir("$TEST_DIR/".'$HOME');
($options, $pkgs_to_delete, $pkgs_to_stow) = process_options(); ($options, $pkgs_to_delete, $pkgs_to_stow) = process_options();
is($options->{target}, "$OUT_DIR/".'$HOME', 'no expansion'); is($options->{target}, "$TEST_DIR/".'$HOME', 'no expansion');
remove_dir("$OUT_DIR/".'$HOME'); remove_dir("$TEST_DIR/".'$HOME');
# vim:ft=perl # vim:ft=perl

2
t/defer.t
View file

@ -27,7 +27,7 @@ use testutil;
use Test::More tests => 4; use Test::More tests => 4;
init_test_dirs(); init_test_dirs();
cd("$OUT_DIR/target"); cd("$TEST_DIR/target");
my $stow; my $stow;

2
t/dotfiles.t
View file

@ -30,7 +30,7 @@ use English qw(-no_match_vars);
use testutil; use testutil;
init_test_dirs(); init_test_dirs();
cd("$OUT_DIR/target"); cd("$TEST_DIR/target");
my $stow; my $stow;

2
t/examples.t
View file

@ -28,7 +28,7 @@ use Test::More tests => 10;
use English qw(-no_match_vars); use English qw(-no_match_vars);
init_test_dirs(); init_test_dirs();
cd("$OUT_DIR/target"); cd("$TEST_DIR/target");
my $stow; my $stow;

26
t/find_stowed_path.t
View file

@ -28,15 +28,15 @@ use Test::More tests => 6;
init_test_dirs(); init_test_dirs();
my $stow = new_Stow(dir => "$OUT_DIR/stow"); my $stow = new_Stow(dir => "$TEST_DIR/stow");
is_deeply( is_deeply(
[ $stow->find_stowed_path("$OUT_DIR/target/a/b/c", '../../../stow/a/b/c') ], [ $stow->find_stowed_path("$TEST_DIR/target/a/b/c", '../../../stow/a/b/c') ],
[ "$OUT_DIR/stow/a/b/c", "$OUT_DIR/stow", 'a' ] [ "$TEST_DIR/stow/a/b/c", "$TEST_DIR/stow", 'a' ]
=> 'from root' => 'from root'
); );
cd("$OUT_DIR/target"); cd("$TEST_DIR/target");
$stow->set_stow_dir('../stow'); $stow->set_stow_dir('../stow');
is_deeply( is_deeply(
[ $stow->find_stowed_path('a/b/c','../../../stow/a/b/c') ], [ $stow->find_stowed_path('a/b/c','../../../stow/a/b/c') ],
@ -46,33 +46,33 @@ is_deeply(
make_dir('stow'); make_dir('stow');
cd('../..'); cd('../..');
$stow->set_stow_dir("$OUT_DIR/target/stow"); $stow->set_stow_dir("$TEST_DIR/target/stow");
is_deeply( is_deeply(
[ $stow->find_stowed_path("$OUT_DIR/target/a/b/c", '../../stow/a/b/c') ], [ $stow->find_stowed_path("$TEST_DIR/target/a/b/c", '../../stow/a/b/c') ],
[ "$OUT_DIR/target/stow/a/b/c", "$OUT_DIR/target/stow", 'a' ] [ "$TEST_DIR/target/stow/a/b/c", "$TEST_DIR/target/stow", 'a' ]
=> 'stow is subdir of target directory' => 'stow is subdir of target directory'
); );
is_deeply( is_deeply(
[ $stow->find_stowed_path("$OUT_DIR/target/a/b/c",'../../empty') ], [ $stow->find_stowed_path("$TEST_DIR/target/a/b/c",'../../empty') ],
[ '', '', '' ] [ '', '', '' ]
=> 'target is not stowed' => 'target is not stowed'
); );
make_dir("$OUT_DIR/target/stow2"); make_dir("$TEST_DIR/target/stow2");
make_file("$OUT_DIR/target/stow2/.stow"); make_file("$TEST_DIR/target/stow2/.stow");
is_deeply( is_deeply(
[ $stow->find_stowed_path("$OUT_DIR/target/a/b/c",'../../stow2/a/b/c') ], [ $stow->find_stowed_path("$TEST_DIR/target/a/b/c",'../../stow2/a/b/c') ],
[ "$OUT_DIR/target/stow2/a/b/c", "$OUT_DIR/target/stow2", 'a' ] [ "$TEST_DIR/target/stow2/a/b/c", "$TEST_DIR/target/stow2", 'a' ]
=> q(detect alternate stow directory) => q(detect alternate stow directory)
); );
# Possible corner case with rogue symlink pointing to ancestor of # Possible corner case with rogue symlink pointing to ancestor of
# stow dir. # stow dir.
is_deeply( is_deeply(
[ $stow->find_stowed_path("$OUT_DIR/target/a/b/c",'../../..') ], [ $stow->find_stowed_path("$TEST_DIR/target/a/b/c",'../../..') ],
[ '', '', '' ] [ '', '', '' ]
=> q(corner case - link points to ancestor of stow dir) => q(corner case - link points to ancestor of stow dir)
); );

2
t/foldable.t
View file

@ -28,7 +28,7 @@ use Test::More tests => 4;
use English qw(-no_match_vars); use English qw(-no_match_vars);
init_test_dirs(); init_test_dirs();
cd("$OUT_DIR/target"); cd("$TEST_DIR/target");
my $stow = new_Stow(dir => '../stow'); my $stow = new_Stow(dir => '../stow');

2
t/ignore.t
View file

@ -29,7 +29,7 @@ use testutil;
use Stow::Util qw(join_paths); use Stow::Util qw(join_paths);
init_test_dirs(); init_test_dirs();
cd("$OUT_DIR/target"); cd("$TEST_DIR/target");
my $stow = new_Stow(); my $stow = new_Stow();

28
t/rc_options.t
View file

@ -29,7 +29,7 @@ use testutil;
require 'stow'; require 'stow';
# stowrc file used for testing. # stowrc file used for testing.
my $RC_FILE = "$OUT_DIR/.stowrc"; my $RC_FILE = "$TEST_DIR/.stowrc";
# Take the safe route and cowardly refuse to continue if there's # Take the safe route and cowardly refuse to continue if there's
# already a file at $RC_FILE. # already a file at $RC_FILE.
if (-e $RC_FILE) { if (-e $RC_FILE) {
@ -52,24 +52,24 @@ init_test_dirs();
# #
local @ARGV = ('dummy'); local @ARGV = ('dummy');
$rc_contents = <<HERE; $rc_contents = <<HERE;
-d $OUT_DIR/stow -d $TEST_DIR/stow
--target $OUT_DIR/target --target $TEST_DIR/target
HERE HERE
make_file($RC_FILE, $rc_contents); make_file($RC_FILE, $rc_contents);
my ($options, $pkgs_to_delete, $pkgs_to_stow) = process_options(); my ($options, $pkgs_to_delete, $pkgs_to_stow) = process_options();
is($options->{target}, "$OUT_DIR/target", "rc options different lines"); is($options->{target}, "$TEST_DIR/target", "rc options different lines");
is($options->{dir}, "$OUT_DIR/stow", "rc options different lines"); is($options->{dir}, "$TEST_DIR/stow", "rc options different lines");
# #
# Test that scalar cli option overwrites conflicting stowrc option. # Test that scalar cli option overwrites conflicting stowrc option.
# #
local @ARGV = ('-d', "$OUT_DIR/stow",'dummy'); local @ARGV = ('-d', "$TEST_DIR/stow",'dummy');
$rc_contents = <<HERE; $rc_contents = <<HERE;
-d bad/path -d bad/path
HERE HERE
make_file($RC_FILE, $rc_contents); make_file($RC_FILE, $rc_contents);
($options, $pkgs_to_delete, $pkgs_to_stow) = process_options(); ($options, $pkgs_to_delete, $pkgs_to_stow) = process_options();
is($options->{dir}, "$OUT_DIR/stow", "cli overwrite scalar rc option."); is($options->{dir}, "$TEST_DIR/stow", "cli overwrite scalar rc option.");
# #
# Test that list cli option merges with conflicting stowrc option. # Test that list cli option merges with conflicting stowrc option.
@ -98,8 +98,8 @@ is_deeply($options->{defer}, [qr(\Ainfo), qr(\Aman)],
# Test environment variable expansion function. # Test environment variable expansion function.
# #
# Basic expansion # Basic expansion
is(expand_environment('$HOME/stow'), "$OUT_DIR/stow", 'expand $HOME'); is(expand_environment('$HOME/stow'), "$TEST_DIR/stow", 'expand $HOME');
is(expand_environment('${HOME}/stow'), "$OUT_DIR/stow", 'expand ${HOME}'); is(expand_environment('${HOME}/stow'), "$TEST_DIR/stow", 'expand ${HOME}');
delete $ENV{UNDEFINED}; # just in case delete $ENV{UNDEFINED}; # just in case
foreach my $var ('$UNDEFINED', '${UNDEFINED}') { foreach my $var ('$UNDEFINED', '${UNDEFINED}') {
@ -144,9 +144,9 @@ $rc_contents = <<'HERE';
HERE HERE
make_file($RC_FILE, $rc_contents); make_file($RC_FILE, $rc_contents);
($options, $pkgs_to_delete, $pkgs_to_stow) = get_config_file_options(); ($options, $pkgs_to_delete, $pkgs_to_stow) = get_config_file_options();
is($options->{dir}, "$OUT_DIR/stow", is($options->{dir}, "$TEST_DIR/stow",
"apply environment expansion on stowrc --dir"); "apply environment expansion on stowrc --dir");
is($options->{target}, "$OUT_DIR/stow", is($options->{target}, "$TEST_DIR/stow",
"apply environment expansion on stowrc --target"); "apply environment expansion on stowrc --target");
is_deeply($options->{ignore}, [qr(\$HOME\z)], is_deeply($options->{ignore}, [qr(\$HOME\z)],
"environment expansion not applied on --ignore"); "environment expansion not applied on --ignore");
@ -167,9 +167,9 @@ $rc_contents = <<'HERE';
HERE HERE
make_file($RC_FILE, $rc_contents); make_file($RC_FILE, $rc_contents);
($options, $pkgs_to_delete, $pkgs_to_stow) = get_config_file_options(); ($options, $pkgs_to_delete, $pkgs_to_stow) = get_config_file_options();
is($options->{dir}, "$OUT_DIR/stow", is($options->{dir}, "$TEST_DIR/stow",
"apply environment expansion on stowrc --dir"); "apply environment expansion on stowrc --dir");
is($options->{target}, "$OUT_DIR/stow", is($options->{target}, "$TEST_DIR/stow",
"apply environment expansion on stowrc --target"); "apply environment expansion on stowrc --target");
is_deeply($options->{ignore}, [qr(~/stow\z)], is_deeply($options->{ignore}, [qr(~/stow\z)],
"environment expansion not applied on --ignore"); "environment expansion not applied on --ignore");
@ -181,5 +181,5 @@ is_deeply($options->{override}, [qr(\A~/stow)],
# Clean up files used for testing. # Clean up files used for testing.
# #
unlink $RC_FILE or die "Unable to clean up $RC_FILE.\n"; unlink $RC_FILE or die "Unable to clean up $RC_FILE.\n";
remove_dir($OUT_DIR); remove_dir($TEST_DIR);

32
t/stow.t
View file

@ -30,7 +30,7 @@ use Stow::Util qw(canon_path);
use testutil; use testutil;
init_test_dirs(); init_test_dirs();
cd("$OUT_DIR/target"); cd("$TEST_DIR/target");
my $stow; my $stow;
my %conflicts; my %conflicts;
@ -400,16 +400,16 @@ uncapture_stderr();
# stow a simple tree minimally when cwd isn't target # stow a simple tree minimally when cwd isn't target
# #
cd('../..'); cd('../..');
$stow = new_Stow(dir => "$OUT_DIR/stow", target => "$OUT_DIR/target"); $stow = new_Stow(dir => "$TEST_DIR/stow", target => "$TEST_DIR/target");
make_dir("$OUT_DIR/stow/pkg16/bin16"); make_dir("$TEST_DIR/stow/pkg16/bin16");
make_file("$OUT_DIR/stow/pkg16/bin16/file16"); make_file("$TEST_DIR/stow/pkg16/bin16/file16");
$stow->plan_stow('pkg16'); $stow->plan_stow('pkg16');
$stow->process_tasks(); $stow->process_tasks();
is_deeply([ $stow->get_conflicts ], [], 'no conflicts with minimal stow'); is_deeply([ $stow->get_conflicts ], [], 'no conflicts with minimal stow');
is( is(
readlink("$OUT_DIR/target/bin16"), readlink("$TEST_DIR/target/bin16"),
'../stow/pkg16/bin16', '../stow/pkg16/bin16',
=> "minimal stow of a simple tree when cwd isn't target" => "minimal stow of a simple tree when cwd isn't target"
); );
@ -418,17 +418,17 @@ is(
# stow a simple tree minimally to absolute stow dir when cwd isn't # stow a simple tree minimally to absolute stow dir when cwd isn't
# target # target
# #
$stow = new_Stow(dir => canon_path("$OUT_DIR/stow"), $stow = new_Stow(dir => canon_path("$TEST_DIR/stow"),
target => "$OUT_DIR/target"); target => "$TEST_DIR/target");
make_dir("$OUT_DIR/stow/pkg17/bin17"); make_dir("$TEST_DIR/stow/pkg17/bin17");
make_file("$OUT_DIR/stow/pkg17/bin17/file17"); make_file("$TEST_DIR/stow/pkg17/bin17/file17");
$stow->plan_stow('pkg17'); $stow->plan_stow('pkg17');
$stow->process_tasks(); $stow->process_tasks();
is_deeply([ $stow->get_conflicts ], [], 'no conflicts with minimal stow'); is_deeply([ $stow->get_conflicts ], [], 'no conflicts with minimal stow');
is( is(
readlink("$OUT_DIR/target/bin17"), readlink("$TEST_DIR/target/bin17"),
'../stow/pkg17/bin17', '../stow/pkg17/bin17',
=> "minimal stow of a simple tree with absolute stow dir" => "minimal stow of a simple tree with absolute stow dir"
); );
@ -437,17 +437,17 @@ is(
# stow a simple tree minimally with absolute stow AND target dirs when # stow a simple tree minimally with absolute stow AND target dirs when
# cwd isn't target # cwd isn't target
# #
$stow = new_Stow(dir => canon_path("$OUT_DIR/stow"), $stow = new_Stow(dir => canon_path("$TEST_DIR/stow"),
target => canon_path("$OUT_DIR/target")); target => canon_path("$TEST_DIR/target"));
make_dir("$OUT_DIR/stow/pkg18/bin18"); make_dir("$TEST_DIR/stow/pkg18/bin18");
make_file("$OUT_DIR/stow/pkg18/bin18/file18"); make_file("$TEST_DIR/stow/pkg18/bin18/file18");
$stow->plan_stow('pkg18'); $stow->plan_stow('pkg18');
$stow->process_tasks(); $stow->process_tasks();
is_deeply([ $stow->get_conflicts ], [], 'no conflicts with minimal stow'); is_deeply([ $stow->get_conflicts ], [], 'no conflicts with minimal stow');
is( is(
readlink("$OUT_DIR/target/bin18"), readlink("$TEST_DIR/target/bin18"),
'../stow/pkg18/bin18', '../stow/pkg18/bin18',
=> "minimal stow of a simple tree with absolute stow and target dirs" => "minimal stow of a simple tree with absolute stow and target dirs"
); );
@ -458,7 +458,7 @@ is(
# folded directories should be split open (unfolded) where # folded directories should be split open (unfolded) where
# (and only where) necessary # (and only where) necessary
# #
cd("$OUT_DIR/target"); cd("$TEST_DIR/target");
sub create_pkg { sub create_pkg {
my ($id, $pkg) = @_; my ($id, $pkg) = @_;

8
t/testutil.pm
View file

@ -36,7 +36,7 @@ use Stow::Util qw(parent canon_path);
use base qw(Exporter); use base qw(Exporter);
our @EXPORT = qw( our @EXPORT = qw(
$OUT_DIR $TEST_DIR
$stderr $stderr
init_test_dirs init_test_dirs
cd cd
@ -48,7 +48,7 @@ our @EXPORT = qw(
capture_stderr uncapture_stderr capture_stderr uncapture_stderr
); );
our $OUT_DIR = 'tmp-testing-trees'; our $TEST_DIR = 'tmp-testing-trees';
our $stderr; our $stderr;
my $tied_err; my $tied_err;
@ -64,13 +64,13 @@ sub uncapture_stderr {
} }
sub init_test_dirs { sub init_test_dirs {
for my $dir ("$OUT_DIR/target", "$OUT_DIR/stow") { for my $dir ("$TEST_DIR/target", "$TEST_DIR/stow") {
-d $dir and remove_tree($dir); -d $dir and remove_tree($dir);
make_dir($dir); make_dir($dir);
} }
# Don't let user's ~/.stow-global-ignore affect test results # Don't let user's ~/.stow-global-ignore affect test results
$ENV{HOME} = $OUT_DIR; $ENV{HOME} = $TEST_DIR;
} }
sub new_Stow { sub new_Stow {

42
t/unstow.t
View file

@ -30,7 +30,7 @@ use testutil;
use Stow::Util qw(canon_path); use Stow::Util qw(canon_path);
init_test_dirs(); init_test_dirs();
cd("$OUT_DIR/target"); cd("$TEST_DIR/target");
# Note that each of the following tests use a distinct set of files # Note that each of the following tests use a distinct set of files
@ -279,8 +279,8 @@ ok(
# Unstow a never stowed package # Unstow a never stowed package
# #
eval { remove_dir("$OUT_DIR/target"); }; eval { remove_dir("$TEST_DIR/target"); };
mkdir("$OUT_DIR/target"); mkdir("$TEST_DIR/target");
$stow = new_Stow(); $stow = new_Stow();
$stow->plan_unstow('pkg12'); $stow->plan_unstow('pkg12');
@ -310,17 +310,17 @@ ok(
# unstow a simple tree minimally when cwd isn't target # unstow a simple tree minimally when cwd isn't target
# #
cd('../..'); cd('../..');
$stow = new_Stow(dir => "$OUT_DIR/stow", target => "$OUT_DIR/target"); $stow = new_Stow(dir => "$TEST_DIR/stow", target => "$TEST_DIR/target");
make_dir("$OUT_DIR/stow/pkg13/bin13"); make_dir("$TEST_DIR/stow/pkg13/bin13");
make_file("$OUT_DIR/stow/pkg13/bin13/file13"); make_file("$TEST_DIR/stow/pkg13/bin13/file13");
make_link("$OUT_DIR/target/bin13", '../stow/pkg13/bin13'); make_link("$TEST_DIR/target/bin13", '../stow/pkg13/bin13');
$stow->plan_unstow('pkg13'); $stow->plan_unstow('pkg13');
$stow->process_tasks(); $stow->process_tasks();
ok( ok(
$stow->get_conflict_count == 0 && $stow->get_conflict_count == 0 &&
-f "$OUT_DIR/stow/pkg13/bin13/file13" && ! -e "$OUT_DIR/target/bin13" -f "$TEST_DIR/stow/pkg13/bin13/file13" && ! -e "$TEST_DIR/target/bin13"
=> 'unstow a simple tree' => 'unstow a simple tree'
); );
@ -328,18 +328,18 @@ ok(
# unstow a simple tree minimally with absolute stow dir when cwd isn't # unstow a simple tree minimally with absolute stow dir when cwd isn't
# target # target
# #
$stow = new_Stow(dir => canon_path("$OUT_DIR/stow"), $stow = new_Stow(dir => canon_path("$TEST_DIR/stow"),
target => "$OUT_DIR/target"); target => "$TEST_DIR/target");
make_dir("$OUT_DIR/stow/pkg14/bin14"); make_dir("$TEST_DIR/stow/pkg14/bin14");
make_file("$OUT_DIR/stow/pkg14/bin14/file14"); make_file("$TEST_DIR/stow/pkg14/bin14/file14");
make_link("$OUT_DIR/target/bin14", '../stow/pkg14/bin14'); make_link("$TEST_DIR/target/bin14", '../stow/pkg14/bin14');
$stow->plan_unstow('pkg14'); $stow->plan_unstow('pkg14');
$stow->process_tasks(); $stow->process_tasks();
ok( ok(
$stow->get_conflict_count == 0 && $stow->get_conflict_count == 0 &&
-f "$OUT_DIR/stow/pkg14/bin14/file14" && ! -e "$OUT_DIR/target/bin14" -f "$TEST_DIR/stow/pkg14/bin14/file14" && ! -e "$TEST_DIR/target/bin14"
=> 'unstow a simple tree with absolute stow dir' => 'unstow a simple tree with absolute stow dir'
); );
@ -347,18 +347,18 @@ ok(
# unstow a simple tree minimally with absolute stow AND target dirs # unstow a simple tree minimally with absolute stow AND target dirs
# when cwd isn't target # when cwd isn't target
# #
$stow = new_Stow(dir => canon_path("$OUT_DIR/stow"), $stow = new_Stow(dir => canon_path("$TEST_DIR/stow"),
target => canon_path("$OUT_DIR/target")); target => canon_path("$TEST_DIR/target"));
make_dir("$OUT_DIR/stow/pkg15/bin15"); make_dir("$TEST_DIR/stow/pkg15/bin15");
make_file("$OUT_DIR/stow/pkg15/bin15/file15"); make_file("$TEST_DIR/stow/pkg15/bin15/file15");
make_link("$OUT_DIR/target/bin15", '../stow/pkg15/bin15'); make_link("$TEST_DIR/target/bin15", '../stow/pkg15/bin15');
$stow->plan_unstow('pkg15'); $stow->plan_unstow('pkg15');
$stow->process_tasks(); $stow->process_tasks();
ok( ok(
$stow->get_conflict_count == 0 && $stow->get_conflict_count == 0 &&
-f "$OUT_DIR/stow/pkg15/bin15/file15" && ! -e "$OUT_DIR/target/bin15" -f "$TEST_DIR/stow/pkg15/bin15/file15" && ! -e "$TEST_DIR/target/bin15"
=> 'unstow a simple tree with absolute stow and target dirs' => 'unstow a simple tree with absolute stow and target dirs'
); );
@ -366,7 +366,7 @@ ok(
# unstow a tree with no-folding enabled - # unstow a tree with no-folding enabled -
# no refolding should take place # no refolding should take place
# #
cd("$OUT_DIR/target"); cd("$TEST_DIR/target");
sub create_and_stow_pkg { sub create_and_stow_pkg {
my ($id, $pkg) = @_; my ($id, $pkg) = @_;

40
t/unstow_orig.t
View file

@ -30,7 +30,7 @@ use testutil;
use Stow::Util qw(canon_path); use Stow::Util qw(canon_path);
init_test_dirs(); init_test_dirs();
cd("$OUT_DIR/target"); cd("$TEST_DIR/target");
# Note that each of the following tests use a distinct set of files # Note that each of the following tests use a distinct set of files
@ -308,8 +308,8 @@ check_protected_dirs_skipped();
# Unstow a never stowed package # Unstow a never stowed package
# #
eval { remove_dir("$OUT_DIR/target"); }; eval { remove_dir("$TEST_DIR/target"); };
mkdir("$OUT_DIR/target"); mkdir("$TEST_DIR/target");
$stow = new_compat_Stow(); $stow = new_compat_Stow();
capture_stderr(); capture_stderr();
@ -343,17 +343,17 @@ check_protected_dirs_skipped();
# unstow a simple tree minimally when cwd isn't target # unstow a simple tree minimally when cwd isn't target
# #
cd('../..'); cd('../..');
$stow = new_Stow(dir => "$OUT_DIR/stow", target => "$OUT_DIR/target"); $stow = new_Stow(dir => "$TEST_DIR/stow", target => "$TEST_DIR/target");
make_dir("$OUT_DIR/stow/pkg13/bin13"); make_dir("$TEST_DIR/stow/pkg13/bin13");
make_file("$OUT_DIR/stow/pkg13/bin13/file13"); make_file("$TEST_DIR/stow/pkg13/bin13/file13");
make_link("$OUT_DIR/target/bin13", '../stow/pkg13/bin13'); make_link("$TEST_DIR/target/bin13", '../stow/pkg13/bin13');
$stow->plan_unstow('pkg13'); $stow->plan_unstow('pkg13');
$stow->process_tasks(); $stow->process_tasks();
ok( ok(
$stow->get_conflict_count == 0 && $stow->get_conflict_count == 0 &&
-f "$OUT_DIR/stow/pkg13/bin13/file13" && ! -e "$OUT_DIR/target/bin13" -f "$TEST_DIR/stow/pkg13/bin13/file13" && ! -e "$TEST_DIR/target/bin13"
=> 'unstow a simple tree' => 'unstow a simple tree'
); );
@ -361,18 +361,18 @@ ok(
# unstow a simple tree minimally with absolute stow dir when cwd isn't # unstow a simple tree minimally with absolute stow dir when cwd isn't
# target # target
# #
$stow = new_Stow(dir => canon_path("$OUT_DIR/stow"), $stow = new_Stow(dir => canon_path("$TEST_DIR/stow"),
target => "$OUT_DIR/target"); target => "$TEST_DIR/target");
make_dir("$OUT_DIR/stow/pkg14/bin14"); make_dir("$TEST_DIR/stow/pkg14/bin14");
make_file("$OUT_DIR/stow/pkg14/bin14/file14"); make_file("$TEST_DIR/stow/pkg14/bin14/file14");
make_link("$OUT_DIR/target/bin14", '../stow/pkg14/bin14'); make_link("$TEST_DIR/target/bin14", '../stow/pkg14/bin14');
$stow->plan_unstow('pkg14'); $stow->plan_unstow('pkg14');
$stow->process_tasks(); $stow->process_tasks();
ok( ok(
$stow->get_conflict_count == 0 && $stow->get_conflict_count == 0 &&
-f "$OUT_DIR/stow/pkg14/bin14/file14" && ! -e "$OUT_DIR/target/bin14" -f "$TEST_DIR/stow/pkg14/bin14/file14" && ! -e "$TEST_DIR/target/bin14"
=> 'unstow a simple tree with absolute stow dir' => 'unstow a simple tree with absolute stow dir'
); );
@ -380,18 +380,18 @@ ok(
# unstow a simple tree minimally with absolute stow AND target dirs # unstow a simple tree minimally with absolute stow AND target dirs
# when cwd isn't target # when cwd isn't target
# #
$stow = new_Stow(dir => canon_path("$OUT_DIR/stow"), $stow = new_Stow(dir => canon_path("$TEST_DIR/stow"),
target => canon_path("$OUT_DIR/target")); target => canon_path("$TEST_DIR/target"));
make_dir("$OUT_DIR/stow/pkg15/bin15"); make_dir("$TEST_DIR/stow/pkg15/bin15");
make_file("$OUT_DIR/stow/pkg15/bin15/file15"); make_file("$TEST_DIR/stow/pkg15/bin15/file15");
make_link("$OUT_DIR/target/bin15", '../stow/pkg15/bin15'); make_link("$TEST_DIR/target/bin15", '../stow/pkg15/bin15');
$stow->plan_unstow('pkg15'); $stow->plan_unstow('pkg15');
$stow->process_tasks(); $stow->process_tasks();
ok( ok(
$stow->get_conflict_count == 0 && $stow->get_conflict_count == 0 &&
-f "$OUT_DIR/stow/pkg15/bin15/file15" && ! -e "$OUT_DIR/target/bin15" -f "$TEST_DIR/stow/pkg15/bin15/file15" && ! -e "$TEST_DIR/target/bin15"
=> 'unstow a simple tree with absolute stow and target dirs' => 'unstow a simple tree with absolute stow and target dirs'
); );