From: Peter Rabbitson Date: Sun, 17 Jan 2010 22:23:15 +0000 (+0000) Subject: More cleanup X-Git-Tag: v0.08119~9^2~23 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=dafa32f9c243841283a1966476cdfe9300d5c536;p=dbsrgits%2FDBIx-Class.git More cleanup --- diff --git a/t/89dbicadmin.t b/t/89dbicadmin.t index 4d193ef..e1f5a1e 100644 --- a/t/89dbicadmin.t +++ b/t/89dbicadmin.t @@ -1,6 +1,6 @@ # vim: filetype=perl use strict; -use warnings; +use warnings; use Test::More; use lib qw(t/lib); @@ -41,6 +41,8 @@ for my $js (@json_backends) { } sub test_dbicadmin { +# $ENV{PERL5LIB} = join ':', @INC; + my $schema = DBICTest->init_schema( sqlite_use_file => 1 ); # reinit a fresh db for every run my $employees = $schema->resultset('Employee'); @@ -64,8 +66,8 @@ sub test_dbicadmin { my $data = do { local $/; <$fh> }; close($fh); if (!ok( ($data=~/Aran.*Trout/s), "$ENV{JSON_ANY_ORDER}: select with attrs" )) { - diag ("data from select is $data") - }; + diag ("data from select is $data") + }; } system( _prepare_system_args( qw|--op=delete --where={"name":"Trout"}| ) ); @@ -80,10 +82,11 @@ sub test_dbicadmin { # sub _prepare_system_args { my $perl = $^X; + my @args = ( - qw|script/dbicadmin --quiet --schema=DBICTest::Schema --class=Employee --tlibs|, + qw|script/dbicadmin --quiet --schema=DBICTest::Schema --class=Employee|, q|--connect=["dbi:SQLite:dbname=t/var/DBIxClass.db","","",{"AutoCommit":1}]|, - qw|--force --tlibs|, + qw|--force|, @_, ); diff --git a/t/admin/03data.t b/t/admin/03data.t index 338771e..8251be1 100644 --- a/t/admin/03data.t +++ b/t/admin/03data.t @@ -77,6 +77,4 @@ use ok 'DBIx::Class::Admin'; is ($employees->count(), 1, "left Aran" ); } - - done_testing;