X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F94versioning.t;h=7884cad2b409b3c6c5de331595c7669baf9bdd27;hb=8d6b1478d8fa6f7c76e313ee72a72d5eb4c24d03;hp=865ac26279db280cc1515d02e1e79298b5d7d546;hpb=d9bd51956470404b3960871d3413fa98f16961d2;p=dbsrgits%2FDBIx-Class.git diff --git a/t/94versioning.t b/t/94versioning.t index 865ac26..7884cad 100644 --- a/t/94versioning.t +++ b/t/94versioning.t @@ -10,7 +10,7 @@ use File::Copy; use Time::HiRes qw/time sleep/; use lib qw(t/lib); -use DBICTest; # do not remove even though it is not used +use DBICTest; my ($dsn, $user, $pass); @@ -30,13 +30,18 @@ BEGIN { unless DBIx::Class::Optional::Dependencies->req_ok_for ('test_rdbms_mysql'); } +# this is just to grab a lock +{ + my $s = DBICTest::Schema->connect($dsn, $user, $pass); +} + use_ok('DBICVersion_v1'); my $version_table_name = 'dbix_class_schema_versions'; my $old_table_name = 'SchemaVersions'; -my $ddl_dir = dir ('t', 'var'); -mkdir ($ddl_dir) unless -d $ddl_dir; +my $ddl_dir = dir(qw/t var/, "versioning_ddl-$$"); +$ddl_dir->mkpath unless -d $ddl_dir; my $fn = { v1 => $ddl_dir->file ('DBICVersion-Schema-1.0-MySQL.sql'), @@ -271,8 +276,10 @@ system( qq($^X -pi.bak -e "s/ALTER/-- this is a comment\nALTER/" $fn->{trans_v23 ok($get_db_version_run == 0, "attributes pulled from list connect_info"); } -unless ($ENV{DBICTEST_KEEP_VERSIONING_DDL}) { - unlink $_ for (values %$fn); +END { + unless ($ENV{DBICTEST_KEEP_VERSIONING_DDL}) { + $ddl_dir->rmtree; + } } done_testing;