SF.net SVN: ledger-smb:[2929] trunk

[..hidden..]

Revision: 2929
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=2929&view=rev
Author:   einhverfr
Date:     2010-03-01 04:07:27 +0000 (Mon, 01 Mar 2010)

Log Message:
-----------
Test case updates

Modified Paths:
--------------
    trunk/INSTALL.manual
    trunk/sql/modules/Roles.sql
    trunk/sql/modules/test/System.sql
    trunk/t/40-dbsetup.t
    trunk/t/89-dropdb.t

Modified: trunk/INSTALL.manual
===================================================================
--- trunk/INSTALL.manual	2010-03-01 03:46:57 UTC (rev 2928)
+++ trunk/INSTALL.manual	2010-03-01 04:07:27 UTC (rev 2929)
@@ -83,8 +83,8 @@
 user:group apache:apache, or as appropriate for your distribution's Apache 
 conventions.
 
-Apache must also be able to read (but not write) ledgersmb13/ and its 
-subdirectories.
+Apache must also be able to read (but not write) the LedgerSMB root directory 
+and its subdirectories.
 
 
 Check And Satisfy Perl Dependencies

Modified: trunk/sql/modules/Roles.sql
===================================================================
--- trunk/sql/modules/Roles.sql	2010-03-01 03:46:57 UTC (rev 2928)
+++ trunk/sql/modules/Roles.sql	2010-03-01 04:07:27 UTC (rev 2929)
@@ -1437,6 +1437,7 @@
 GRANT ALL ON pending_job, payments_queue TO PUBLIC;
 GRANT ALL ON pending_job_id_seq TO public;
 GRANT ALL ON invoice_tax_form TO public;
+GRANT SELECT ON taxmodule TO public;
 GRANT ALL ON ac_tax_form to public;
 GRANT SELECT ON country_tax_form to public;
 GRANT SELECT ON translation TO public;

Modified: trunk/sql/modules/test/System.sql
===================================================================
--- trunk/sql/modules/test/System.sql	2010-03-01 03:46:57 UTC (rev 2928)
+++ trunk/sql/modules/test/System.sql	2010-03-01 04:07:27 UTC (rev 2929)
@@ -4,6 +4,7 @@
 CREATE TABLE test_exempt_funcs (funcname text primary key);
 
 insert into test_exempt_funcs values ('rewrite');
+insert into test_exempt_funcs values ('gin_extract_trgm');
 insert into test_exempt_funcs values ('plainto_tsquery');
 insert into test_exempt_funcs values ('headline');
 insert into test_exempt_funcs values ('rank');

Modified: trunk/t/40-dbsetup.t
===================================================================
--- trunk/t/40-dbsetup.t	2010-03-01 03:46:57 UTC (rev 2928)
+++ trunk/t/40-dbsetup.t	2010-03-01 04:07:27 UTC (rev 2929)
@@ -32,19 +32,7 @@
 my @contrib_scripts = qw(pg_trgm tsearch2 tablefunc);
 
 for my $contrib (@contrib_scripts){
-    open (PSQL, '-|', "psql -f $ENV{PG_CONTRIB_DIR}/$contrib.sql");
-    my $test = 0;
-    while (my $line = <PSQL>){
-        chomp($line);
-        if ($line eq 'COMMIT'){
-            $test = 1;
-        }
-    }
-    if ($contrib eq 'tablefunc'){
-        $test = '1';
-    }
-    cmp_ok($test, 'eq', '1', "$contrib loaded and committed");
-    close(PSQL);
+    ok(!system "psql -f $ENV{PG_CONTRIB_DIR}/$contrib.sql");
 }
 
 

Modified: trunk/t/89-dropdb.t
===================================================================
--- trunk/t/89-dropdb.t	2010-03-01 03:46:57 UTC (rev 2928)
+++ trunk/t/89-dropdb.t	2010-03-01 04:07:27 UTC (rev 2929)
@@ -14,7 +14,7 @@
 }
 
 if ($run_tests){
-	plan tests => 6;
+	plan tests => 5;
 	$ENV{PGDATABASE} = $ENV{LSMB_NEW_DB};
 }
 
@@ -23,8 +23,5 @@
 chomp($db);
 cmp_ok($db, 'eq', $ENV{LSMB_NEW_DB}, 'Got expected db name out');
 ok(close (DBLOCK), 'Closed db lock file');
-ok(open (DROPDB, '-|', "dropdb $db"), 'Opened drop db');
-my $dropvar = <DROPDB>;
-chomp($dropvar);
-cmp_ok($dropvar, 'eq', 'DROP DATABASE', 'Database dropped');
+ok(!system ("dropdb $ENV{LSMB_NEW_DB}"), 'dropped db');
 ok(unlink ("$temp/LSMB_TEST_DB"), 'Removed test db lockfile');


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.