Making regression tests work on Lenny.

This commit is contained in:
Andrew McMillan 2010-09-12 14:47:26 +12:00
parent a0ca0e27c7
commit 0d9edf6632
8 changed files with 24 additions and 18 deletions

View File

@ -92,7 +92,7 @@ restore_database() {
TEST="Restore-Database"
createdb --owner davical_dba --encoding UTF8 ${DBNAME} >"${RESULTS}/${TEST}" 2>&1
pg_restore -Ft -d ${DBNAME} "${REGRESSION}/initial.dbdump" >>"${RESULTS}/${TEST}" 2>&1
pg_restore -d ${DBNAME} "${REGRESSION}/initial.dbdump" >>"${RESULTS}/${TEST}" 2>&1
check_result "${TEST}"
}

View File

@ -12,7 +12,7 @@ $c->dbg = array();
require_once("RRule-v2.php");
require_once('AwlQuery.php');
@header("Content-type: text/plain");
@header("Content-Type: text/plain");
echo <<<EOTXT
Testing the RRule v2 Library

View File

@ -13,3 +13,5 @@ HEAD
#
REPLACE=/P: 0\.\d{4} & S: 0\.\d{4}//
# REPLACE=/Content-Type: text.(html|plain)/Content-Type: text/
REPLACE=~Content-Type: text/html~Content-Type: text/plain~

View File

@ -9,6 +9,10 @@ HEADER=Content-Type: application/xml
REPLACE=#<creationdate>2\d{3}-\d\d-\d\dT\d\d:\d\d:\d\d[+-]\d\d:\d\d</creationdate>#<creationdate>YYYY-MM-DDThh:mm:ss+ZZ:ZZ</creationdate>#
# Older versions of PHP urlencoded the ~ incorrectly. Ignore it.
# REPLACE=/%7Euser1/=/~user1/=
REPLACE=#%7E#~#
BEGINDATA
<?xml version="1.0" encoding="utf-8"?>
<propfind xmlns="DAV:">

View File

@ -109,15 +109,15 @@ END:VCALENDAR
rrule: >NULL<
status: >TENTATIVE<
Dav Name: >/user1/home/3F4CF6227300FD062D9EF3CDFB30D32D-0.ics<
a) start: >20061101T233000Z<
b)finish: >20061102T003000Z<
rrule: >NULL<
status: >NULL<
Dav Name: >/user1/home/20061101T073004Z.ics<
a) start: >20061031T210000Z<
b)finish: >20061031T220000Z<
rrule: >NULL<
status: >NULL<
Dav Name: >/user1/home/3F4CF6227300FD062D9EF3CDFB30D32D-0.ics<
a) start: >20061101T233000Z<
b)finish: >20061102T003000Z<
rrule: >NULL<
status: >NULL<

View File

@ -20,7 +20,7 @@ ENDDATA
QUERY
SELECT dav_name "Dav Name", calendar_item.rrule, status,
SELECT dav_name AS "Dav Name", calendar_item.rrule, status,
to_char(calendar_item.dtstart at time zone 'GMT','YYYYMMDD"T"HH24MISS"Z"') AS "a) start",
to_char(calendar_item.dtend at time zone 'GMT','YYYYMMDD"T"HH24MISS"Z"') AS "b)finish"
FROM caldav_data INNER JOIN calendar_item USING(dav_id,user_no,dav_name)
@ -29,5 +29,5 @@ SELECT dav_name "Dav Name", calendar_item.rrule, status,
AND caldav_data.caldav_type IN ( 'VEVENT', 'VFREEBUSY' )
AND (calendar_item.status != 'CANCELLED' OR calendar_item.status IS NULL)
AND (calendar_item.class != 'PRIVATE' OR calendar_item.class IS NULL)
ORDER BY 2, 3
ORDER BY 2, 3, 4
ENDQUERY

View File

@ -390,15 +390,15 @@ END:VCALENDAR
rrule: >NULL<
status: >TENTATIVE<
Dav Name: >/user1/home/3F4CF6227300FD062D9EF3CDFB30D32D-0.ics<
a) start: >20061101T233000Z<
b)finish: >20061102T003000Z<
rrule: >NULL<
status: >NULL<
Dav Name: >/user1/home/20061101T073004Z.ics<
a) start: >20061031T210000Z<
b)finish: >20061031T220000Z<
rrule: >NULL<
status: >NULL<
Dav Name: >/user1/home/3F4CF6227300FD062D9EF3CDFB30D32D-0.ics<
a) start: >20061101T233000Z<
b)finish: >20061102T003000Z<
rrule: >NULL<
status: >NULL<

View File

@ -32,7 +32,7 @@ END:VCALENDAR
ENDDATA
QUERY
SELECT dav_name "Dav Name", calendar_item.rrule, status,
SELECT dav_name AS "Dav Name", calendar_item.rrule, status,
to_char(calendar_item.dtstart at time zone 'GMT','YYYYMMDD"T"HH24MISS"Z"') AS "a) start",
to_char(calendar_item.dtend at time zone 'GMT','YYYYMMDD"T"HH24MISS"Z"') AS "b)finish"
FROM caldav_data INNER JOIN calendar_item USING(dav_id,user_no,dav_name)
@ -41,5 +41,5 @@ SELECT dav_name "Dav Name", calendar_item.rrule, status,
AND caldav_data.caldav_type IN ( 'VEVENT', 'VFREEBUSY' )
AND (calendar_item.status != 'CANCELLED' OR calendar_item.status IS NULL)
AND (calendar_item.class != 'PRIVATE' OR calendar_item.class IS NULL)
ORDER BY 2, 3
ORDER BY 2, 3, 4
ENDQUERY