The test script, gcmtest can run individual tests as opposed to running

all tests in sequence.

diff --git a/test/gcmtest b/test/gcmtest
index 7501a7e..8404c6c 100755 (executable)
--- a/test/gcmtest
+++ b/test/gcmtest
@@ -3,8 +3,9 @@
 LD_LIBRARY_PATH=/usr/local/pqxx/lib
 export LD_LIBRARY_PATH
 
-for testscript in t*.sh
-do
+function perform_test()
+{
+   testscript=$1
    name=`basename $testscript .sh`
    sh $testscript 1>$name.log 2>$name.err
    status=$?
@@ -27,5 +28,22 @@ do
       result=FAILED
    fi
    echo Test $name, status = $status. $result
-done
+}
 
+if [ $# -gt 0 ]
+then 
+   echo "Arguments: $1"
+   while [ $# -gt 0 ]
+   do
+      perform_test $1.sh
+      shift
+   done
+else
+
+   for testscript in t*.sh
+   do
+      perform_test $testscript
+
+   done
+
+fi

diff --git a/test/t0001.errors b/test/t0001.errors
index fd64054..cb44b0f 100644 (file)
--- a/test/t0001.errors
+++ b/test/t0001.errors
@@ -1,13 +1,7 @@
-psql:src/database/create.sql:498: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "object_abuse_pkey" for table "object_abuse"
-psql:src/database/create.sql:572: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "object_statistics_pkey" for table "object_statistics"
-psql:src/database/create.sql:608: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "parameter_pkey" for table "parameter"
-psql:src/database/create.sql:628: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "parameter_class_pkey" for table "parameter_class"
-psql:src/database/create.sql:642: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "parameter_notification_pkey" for table "parameter_notification"
-psql:src/database/create.sql:673: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "property_pkey" for table "property"
-psql:src/database/create.sql:812: ERROR:  group "view" already exists
-psql:src/database/create.sql:813: ERROR:  group "ops" already exists
-psql:src/database/create.sql:814: ERROR:  group "admin" already exists
-psql:src/database/destroy.sql:69: ERROR:  table "object_system_user" does not exist
-psql:src/database/destroy.sql:94: ERROR:  sequence "unprocessed_l_unprocessedid_seq" does not exist
-psql:src/database/destroy.sql:96: ERROR:  table "unprocessed_log" does not exist
-psql:src/database/destroy.sql:98: ERROR:  table "user_gnucomo" does not exist
+psql:src/database/create.sql:419: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "object_abuse_pkey" for table "object_abuse"
+psql:src/database/create.sql:493: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "object_statistics_pkey" for table "object_statistics"
+psql:src/database/create.sql:529: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "parameter_pkey" for table "parameter"
+psql:src/database/create.sql:549: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "parameter_class_pkey" for table "parameter_class"
+psql:src/database/create.sql:578: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "parameter_notification_pkey" for table "parameter_notification"
+psql:src/database/create.sql:609: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "property_pkey" for table "property"
+psql:src/database/create.sql:657: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "service_pattern_pkey" for table "service_pattern"

diff --git a/test/t0002a.errors b/test/t0002a.errors
index fd64054..cb44b0f 100644 (file)
--- a/test/t0002a.errors
+++ b/test/t0002a.errors
@@ -1,13 +1,7 @@
-psql:src/database/create.sql:498: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "object_abuse_pkey" for table "object_abuse"
-psql:src/database/create.sql:572: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "object_statistics_pkey" for table "object_statistics"
-psql:src/database/create.sql:608: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "parameter_pkey" for table "parameter"
-psql:src/database/create.sql:628: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "parameter_class_pkey" for table "parameter_class"
-psql:src/database/create.sql:642: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "parameter_notification_pkey" for table "parameter_notification"
-psql:src/database/create.sql:673: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "property_pkey" for table "property"
-psql:src/database/create.sql:812: ERROR:  group "view" already exists
-psql:src/database/create.sql:813: ERROR:  group "ops" already exists
-psql:src/database/create.sql:814: ERROR:  group "admin" already exists
-psql:src/database/destroy.sql:69: ERROR:  table "object_system_user" does not exist
-psql:src/database/destroy.sql:94: ERROR:  sequence "unprocessed_l_unprocessedid_seq" does not exist
-psql:src/database/destroy.sql:96: ERROR:  table "unprocessed_log" does not exist
-psql:src/database/destroy.sql:98: ERROR:  table "user_gnucomo" does not exist
+psql:src/database/create.sql:419: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "object_abuse_pkey" for table "object_abuse"
+psql:src/database/create.sql:493: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "object_statistics_pkey" for table "object_statistics"
+psql:src/database/create.sql:529: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "parameter_pkey" for table "parameter"
+psql:src/database/create.sql:549: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "parameter_class_pkey" for table "parameter_class"
+psql:src/database/create.sql:578: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "parameter_notification_pkey" for table "parameter_notification"
+psql:src/database/create.sql:609: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "property_pkey" for table "property"
+psql:src/database/create.sql:657: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "service_pattern_pkey" for table "service_pattern"

diff --git a/test/t0003.errors b/test/t0003.errors
index abe17ec..7aa91be 100644 (file)
--- a/test/t0003.errors
+++ b/test/t0003.errors
@@ -1,15 +1,9 @@
-psql:src/database/create.sql:498: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "object_abuse_pkey" for table "object_abuse"
-psql:src/database/create.sql:572: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "object_statistics_pkey" for table "object_statistics"
-psql:src/database/create.sql:608: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "parameter_pkey" for table "parameter"
-psql:src/database/create.sql:628: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "parameter_class_pkey" for table "parameter_class"
-psql:src/database/create.sql:642: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "parameter_notification_pkey" for table "parameter_notification"
-psql:src/database/create.sql:673: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "property_pkey" for table "property"
-psql:src/database/create.sql:812: ERROR:  group "view" already exists
-psql:src/database/create.sql:813: ERROR:  group "ops" already exists
-psql:src/database/create.sql:814: ERROR:  group "admin" already exists
+psql:src/database/create.sql:419: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "object_abuse_pkey" for table "object_abuse"
+psql:src/database/create.sql:493: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "object_statistics_pkey" for table "object_statistics"
+psql:src/database/create.sql:529: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "parameter_pkey" for table "parameter"
+psql:src/database/create.sql:549: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "parameter_class_pkey" for table "parameter_class"
+psql:src/database/create.sql:578: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "parameter_notification_pkey" for table "parameter_notification"
+psql:src/database/create.sql:609: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "property_pkey" for table "property"
+psql:src/database/create.sql:657: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "service_pattern_pkey" for table "service_pattern"
 gcm_input WARNING: Not a valid line: nearly empty line
 gcm_input WARNING: Not a valid line: Jun  5 04:02:16 vd 
-psql:src/database/destroy.sql:69: ERROR:  table "object_system_user" does not exist
-psql:src/database/destroy.sql:94: ERROR:  sequence "unprocessed_l_unprocessedid_seq" does not exist
-psql:src/database/destroy.sql:96: ERROR:  table "unprocessed_log" does not exist
-psql:src/database/destroy.sql:98: ERROR:  table "user_gnucomo" does not exist

diff --git a/test/t0004.errors b/test/t0004.errors
index 8faf995..c7abaf4 100644 (file)
--- a/test/t0004.errors
+++ b/test/t0004.errors
@@ -1,14 +1,8 @@
-psql:src/database/create.sql:498: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "object_abuse_pkey" for table "object_abuse"
-psql:src/database/create.sql:572: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "object_statistics_pkey" for table "object_statistics"
-psql:src/database/create.sql:608: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "parameter_pkey" for table "parameter"
-psql:src/database/create.sql:628: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "parameter_class_pkey" for table "parameter_class"
-psql:src/database/create.sql:642: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "parameter_notification_pkey" for table "parameter_notification"
-psql:src/database/create.sql:673: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "property_pkey" for table "property"
-psql:src/database/create.sql:812: ERROR:  group "view" already exists
-psql:src/database/create.sql:813: ERROR:  group "ops" already exists
-psql:src/database/create.sql:814: ERROR:  group "admin" already exists
+psql:src/database/create.sql:419: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "object_abuse_pkey" for table "object_abuse"
+psql:src/database/create.sql:493: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "object_statistics_pkey" for table "object_statistics"
+psql:src/database/create.sql:529: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "parameter_pkey" for table "parameter"
+psql:src/database/create.sql:549: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "parameter_class_pkey" for table "parameter_class"
+psql:src/database/create.sql:578: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "parameter_notification_pkey" for table "parameter_notification"
+psql:src/database/create.sql:609: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "property_pkey" for table "property"
+psql:src/database/create.sql:657: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "service_pattern_pkey" for table "service_pattern"
 Can not determine the hostname where the message came from.
-psql:src/database/destroy.sql:69: ERROR:  table "object_system_user" does not exist
-psql:src/database/destroy.sql:94: ERROR:  sequence "unprocessed_l_unprocessedid_seq" does not exist
-psql:src/database/destroy.sql:96: ERROR:  table "unprocessed_log" does not exist
-psql:src/database/destroy.sql:98: ERROR:  table "user_gnucomo" does not exist

diff --git a/test/t0005.errors b/test/t0005.errors
index fd64054..cb44b0f 100644 (file)
--- a/test/t0005.errors
+++ b/test/t0005.errors
@@ -1,13 +1,7 @@
-psql:src/database/create.sql:498: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "object_abuse_pkey" for table "object_abuse"
-psql:src/database/create.sql:572: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "object_statistics_pkey" for table "object_statistics"
-psql:src/database/create.sql:608: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "parameter_pkey" for table "parameter"
-psql:src/database/create.sql:628: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "parameter_class_pkey" for table "parameter_class"
-psql:src/database/create.sql:642: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "parameter_notification_pkey" for table "parameter_notification"
-psql:src/database/create.sql:673: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "property_pkey" for table "property"
-psql:src/database/create.sql:812: ERROR:  group "view" already exists
-psql:src/database/create.sql:813: ERROR:  group "ops" already exists
-psql:src/database/create.sql:814: ERROR:  group "admin" already exists
-psql:src/database/destroy.sql:69: ERROR:  table "object_system_user" does not exist
-psql:src/database/destroy.sql:94: ERROR:  sequence "unprocessed_l_unprocessedid_seq" does not exist
-psql:src/database/destroy.sql:96: ERROR:  table "unprocessed_log" does not exist
-psql:src/database/destroy.sql:98: ERROR:  table "user_gnucomo" does not exist
+psql:src/database/create.sql:419: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "object_abuse_pkey" for table "object_abuse"
+psql:src/database/create.sql:493: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "object_statistics_pkey" for table "object_statistics"
+psql:src/database/create.sql:529: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "parameter_pkey" for table "parameter"
+psql:src/database/create.sql:549: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "parameter_class_pkey" for table "parameter_class"
+psql:src/database/create.sql:578: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "parameter_notification_pkey" for table "parameter_notification"
+psql:src/database/create.sql:609: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "property_pkey" for table "property"
+psql:src/database/create.sql:657: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "service_pattern_pkey" for table "service_pattern"

diff --git a/test/t0008.errors b/test/t0008.errors
index 400b806..032baab 100644 (file)
--- a/test/t0008.errors
+++ b/test/t0008.errors
@@ -1,25 +1,9 @@
 psql:test/create_v1.sql:382: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "parameter_pkey" for table "parameter"
 psql:test/create_v1.sql:417: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "property_pkey" for table "property"
-PHP Warning:  pg_exec(): Query failed: ERROR:  group "view" already exists
-. in /src/gnucomo/src/phpclasses/db.postgres.php on line 80
-PHP Warning:  pg_exec(): Query failed: ERROR:  group "ops" already exists
-. in /src/gnucomo/src/phpclasses/db.postgres.php on line 80
-PHP Warning:  pg_exec(): Query failed: ERROR:  group "admin" already exists
-. in /src/gnucomo/src/phpclasses/db.postgres.php on line 80
-psql:src/database/destroy.sql:69: ERROR:  table "object_system_user" does not exist
-psql:src/database/destroy.sql:94: ERROR:  sequence "unprocessed_l_unprocessedid_seq" does not exist
-psql:src/database/destroy.sql:96: ERROR:  table "unprocessed_log" does not exist
-psql:src/database/destroy.sql:98: ERROR:  table "user_gnucomo" does not exist
-psql:src/database/create.sql:498: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "object_abuse_pkey" for table "object_abuse"
-psql:src/database/create.sql:572: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "object_statistics_pkey" for table "object_statistics"
-psql:src/database/create.sql:608: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "parameter_pkey" for table "parameter"
-psql:src/database/create.sql:628: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "parameter_class_pkey" for table "parameter_class"
-psql:src/database/create.sql:642: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "parameter_notification_pkey" for table "parameter_notification"
-psql:src/database/create.sql:673: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "property_pkey" for table "property"
-psql:src/database/create.sql:812: ERROR:  group "view" already exists
-psql:src/database/create.sql:813: ERROR:  group "ops" already exists
-psql:src/database/create.sql:814: ERROR:  group "admin" already exists
-psql:src/database/destroy.sql:69: ERROR:  table "object_system_user" does not exist
-psql:src/database/destroy.sql:94: ERROR:  sequence "unprocessed_l_unprocessedid_seq" does not exist
-psql:src/database/destroy.sql:96: ERROR:  table "unprocessed_log" does not exist
-psql:src/database/destroy.sql:98: ERROR:  table "user_gnucomo" does not exist
+psql:src/database/create.sql:419: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "object_abuse_pkey" for table "object_abuse"
+psql:src/database/create.sql:493: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "object_statistics_pkey" for table "object_statistics"
+psql:src/database/create.sql:529: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "parameter_pkey" for table "parameter"
+psql:src/database/create.sql:549: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "parameter_class_pkey" for table "parameter_class"
+psql:src/database/create.sql:578: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "parameter_notification_pkey" for table "parameter_notification"
+psql:src/database/create.sql:609: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "property_pkey" for table "property"
+psql:src/database/create.sql:657: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "service_pattern_pkey" for table "service_pattern"

diff --git a/test/t0008.expect b/test/t0008.expect
index dd77564..8bf53e4 100644 (file)
--- a/test/t0008.expect
+++ b/test/t0008.expect
@@ -1,9 +1,6 @@
 Content-type: text/html\r
 X-Powered-By: PHP/4.3.4\r
 \r
-Query error in CREATE GROUP view
-Query error in CREATE GROUP ops
-Query error in CREATE GROUP admin
 
 621a622,624
 > 

diff --git a/test/t0009.errors b/test/t0009.errors
index abe17ec..7aa91be 100644 (file)
--- a/test/t0009.errors
+++ b/test/t0009.errors
@@ -1,15 +1,9 @@
-psql:src/database/create.sql:498: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "object_abuse_pkey" for table "object_abuse"
-psql:src/database/create.sql:572: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "object_statistics_pkey" for table "object_statistics"
-psql:src/database/create.sql:608: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "parameter_pkey" for table "parameter"
-psql:src/database/create.sql:628: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "parameter_class_pkey" for table "parameter_class"
-psql:src/database/create.sql:642: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "parameter_notification_pkey" for table "parameter_notification"
-psql:src/database/create.sql:673: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "property_pkey" for table "property"
-psql:src/database/create.sql:812: ERROR:  group "view" already exists
-psql:src/database/create.sql:813: ERROR:  group "ops" already exists
-psql:src/database/create.sql:814: ERROR:  group "admin" already exists
+psql:src/database/create.sql:419: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "object_abuse_pkey" for table "object_abuse"
+psql:src/database/create.sql:493: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "object_statistics_pkey" for table "object_statistics"
+psql:src/database/create.sql:529: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "parameter_pkey" for table "parameter"
+psql:src/database/create.sql:549: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "parameter_class_pkey" for table "parameter_class"
+psql:src/database/create.sql:578: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "parameter_notification_pkey" for table "parameter_notification"
+psql:src/database/create.sql:609: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "property_pkey" for table "property"
+psql:src/database/create.sql:657: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "service_pattern_pkey" for table "service_pattern"
 gcm_input WARNING: Not a valid line: nearly empty line
 gcm_input WARNING: Not a valid line: Jun  5 04:02:16 vd 
-psql:src/database/destroy.sql:69: ERROR:  table "object_system_user" does not exist
-psql:src/database/destroy.sql:94: ERROR:  sequence "unprocessed_l_unprocessedid_seq" does not exist
-psql:src/database/destroy.sql:96: ERROR:  table "unprocessed_log" does not exist
-psql:src/database/destroy.sql:98: ERROR:  table "user_gnucomo" does not exist

diff --git a/test/t0009.expect b/test/t0009.expect
index 880acbc..9452632 100644 (file)
--- a/test/t0009.expect
+++ b/test/t0009.expect
@@ -1,20 +1,19 @@
 Content-type: text/html\r
 X-Powered-By: PHP/4.3.4\r
 \r
-NOQUEUE abuses:
-
-SPAM abuses:
-
-HTTP abuses:
-
-Mailing Notification for object id 2
-Mailing Notification for object id 1
+Processing logs...
+Last processed logid = 0 
+Running service check from log id 0.
 Gathering statistics for object 1
 Gathering statistics for object 2
 
  notificationid | objectid | type_of_issueid 
 ----------------+----------+-----------------
-              1 |        2 |               5
-              2 |        1 |               5
-(2 rows)
+              1 |        2 |               8
+              2 |        2 |              10
+              3 |        1 |               8
+              4 |        1 |               9
+              5 |        2 |               5
+              6 |        1 |               5
+(6 rows)
 

diff --git a/test/t0009.sh b/test/t0009.sh
index b13f9de..29ddde0 100644 (file)
--- a/test/t0009.sh
+++ b/test/t0009.sh
@@ -1,10 +1,10 @@
 #!/bin/sh
 
 #
-#  Test the service check notifications.
+#  Test the service and log check notifications.
 #  Create a database with two objects and no services. After reading two
 #  log file fragments for these two objects, gcm_daemon should create
-#  'service unknown' notifications, one for each object.
+#  several notifications, three for each object.
 #
 #  This tests problem report nr. 23
 

diff --git a/test/t0010.errors b/test/t0010.errors
index fd64054..cb44b0f 100644 (file)
--- a/test/t0010.errors
+++ b/test/t0010.errors
@@ -1,13 +1,7 @@
-psql:src/database/create.sql:498: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "object_abuse_pkey" for table "object_abuse"
-psql:src/database/create.sql:572: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "object_statistics_pkey" for table "object_statistics"
-psql:src/database/create.sql:608: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "parameter_pkey" for table "parameter"
-psql:src/database/create.sql:628: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "parameter_class_pkey" for table "parameter_class"
-psql:src/database/create.sql:642: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "parameter_notification_pkey" for table "parameter_notification"
-psql:src/database/create.sql:673: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "property_pkey" for table "property"
-psql:src/database/create.sql:812: ERROR:  group "view" already exists
-psql:src/database/create.sql:813: ERROR:  group "ops" already exists
-psql:src/database/create.sql:814: ERROR:  group "admin" already exists
-psql:src/database/destroy.sql:69: ERROR:  table "object_system_user" does not exist
-psql:src/database/destroy.sql:94: ERROR:  sequence "unprocessed_l_unprocessedid_seq" does not exist
-psql:src/database/destroy.sql:96: ERROR:  table "unprocessed_log" does not exist
-psql:src/database/destroy.sql:98: ERROR:  table "user_gnucomo" does not exist
+psql:src/database/create.sql:419: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "object_abuse_pkey" for table "object_abuse"
+psql:src/database/create.sql:493: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "object_statistics_pkey" for table "object_statistics"
+psql:src/database/create.sql:529: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "parameter_pkey" for table "parameter"
+psql:src/database/create.sql:549: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "parameter_class_pkey" for table "parameter_class"
+psql:src/database/create.sql:578: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "parameter_notification_pkey" for table "parameter_notification"
+psql:src/database/create.sql:609: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "property_pkey" for table "property"
+psql:src/database/create.sql:657: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "service_pattern_pkey" for table "service_pattern"

diff --git a/test/t0011.errors b/test/t0011.errors
index fd64054..cb44b0f 100644 (file)
--- a/test/t0011.errors
+++ b/test/t0011.errors
@@ -1,13 +1,7 @@
-psql:src/database/create.sql:498: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "object_abuse_pkey" for table "object_abuse"
-psql:src/database/create.sql:572: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "object_statistics_pkey" for table "object_statistics"
-psql:src/database/create.sql:608: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "parameter_pkey" for table "parameter"
-psql:src/database/create.sql:628: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "parameter_class_pkey" for table "parameter_class"
-psql:src/database/create.sql:642: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "parameter_notification_pkey" for table "parameter_notification"
-psql:src/database/create.sql:673: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "property_pkey" for table "property"
-psql:src/database/create.sql:812: ERROR:  group "view" already exists
-psql:src/database/create.sql:813: ERROR:  group "ops" already exists
-psql:src/database/create.sql:814: ERROR:  group "admin" already exists
-psql:src/database/destroy.sql:69: ERROR:  table "object_system_user" does not exist
-psql:src/database/destroy.sql:94: ERROR:  sequence "unprocessed_l_unprocessedid_seq" does not exist
-psql:src/database/destroy.sql:96: ERROR:  table "unprocessed_log" does not exist
-psql:src/database/destroy.sql:98: ERROR:  table "user_gnucomo" does not exist
+psql:src/database/create.sql:419: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "object_abuse_pkey" for table "object_abuse"
+psql:src/database/create.sql:493: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "object_statistics_pkey" for table "object_statistics"
+psql:src/database/create.sql:529: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "parameter_pkey" for table "parameter"
+psql:src/database/create.sql:549: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "parameter_class_pkey" for table "parameter_class"
+psql:src/database/create.sql:578: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "parameter_notification_pkey" for table "parameter_notification"
+psql:src/database/create.sql:609: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "property_pkey" for table "property"
+psql:src/database/create.sql:657: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "service_pattern_pkey" for table "service_pattern"