X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fadmin%2F02ddl.t;h=84a73818e759d22d5c42be4cf017ec1bd290deff;hb=aff5e9c14f7ad7453a4a2a7d04dc4e85fa0d661c;hp=9b6d9e53cfe2c943671eade208176c78e0cea0fa;hpb=5a8d5308a40f3958a17335fdc35afddce7d4ae31;p=dbsrgits%2FDBIx-Class.git diff --git a/t/admin/02ddl.t b/t/admin/02ddl.t index 9b6d9e5..84a7381 100644 --- a/t/admin/02ddl.t +++ b/t/admin/02ddl.t @@ -31,7 +31,7 @@ my $ddl_dir = dir(qw/t var/, "admin_ddl-$$"); { # create the schema # make sure we are clean -clean_dir($ddl_dir); +cleanup(); my $admin = DBIx::Class::Admin->new( @@ -50,7 +50,7 @@ lives_ok { { # upgrade schema -clean_dir($ddl_dir); +cleanup(); require DBICVersion_v1; my $admin = DBIx::Class::Admin->new( @@ -92,7 +92,7 @@ is($schema->get_db_version, $DBICVersion::Schema::VERSION, 'Schema and db versio { # install -clean_dir($ddl_dir); +cleanup(); my $admin = DBIx::Class::Admin->new( schema_class => 'DBICVersion::Schema', @@ -115,14 +115,14 @@ warnings_exist ( sub { is($admin->schema->get_db_version, "4.0", 'db thinks its version 4.0'); } -sub clean_dir { +sub cleanup { my ($dir) = @_; - $dir->rmtree if -d $dir; + $ddl_dir->rmtree if -d $ddl_dir; unlink $db_fn; } END { - clean_dir($ddl_dir); + cleanup(); } done_testing;