diff --git a/testing/run_regressions.sh b/testing/run_regressions.sh index b4a40633..b0da370b 100755 --- a/testing/run_regressions.sh +++ b/testing/run_regressions.sh @@ -2,13 +2,15 @@ # # Run the regression tests and display differences # +DBNAME=caldav # Restart PGPool to ensure we can drop and recreate the database # FIXME: We should really drop everything *from* the database and create it # from that, so we don't need to do this. sudo /etc/init.d/pgpool restart -dropdb caldav -../dba/create-database.sh caldav +dropdb ${DBNAME} +../dba/create-database.sh ${DBNAME} +psql -q -f "../dba/sample-data.sql" "${DBNAME}" for T in tests/regression-suite/*.test ; do TEST="`basename ${T} .test`" diff --git a/testing/tests/regression-suite/012-Mulberry-PUT-2.result b/testing/tests/regression-suite/012-Mulberry-PUT-2.result new file mode 100644 index 00000000..e77bdcd7 --- /dev/null +++ b/testing/tests/regression-suite/012-Mulberry-PUT-2.result @@ -0,0 +1,7 @@ +HTTP/1.1 201 Created +Date: Dow, 01 Jan 2000 00:00:00 GMT +Server: Apache/2.2.3 (Debian) DAV/2 +ETag: "22158fc45876987b2b00749a3a1684d8" +Content-length: 0 +Content-Type: text/html; charset=UTF-8 + diff --git a/testing/tests/regression-suite/013-Mulberry-PROPFIND-5.result b/testing/tests/regression-suite/013-Mulberry-PROPFIND-5.result new file mode 100644 index 00000000..49bdcd40 --- /dev/null +++ b/testing/tests/regression-suite/013-Mulberry-PROPFIND-5.result @@ -0,0 +1,50 @@ +HTTP/1.1 207 Multi-Status +Date: Dow, 01 Jan 2000 00:00:00 GMT +Server: Apache/2.2.3 (Debian) DAV/2 +ETag: "38ba0832b5ab1fd7147b102ceba0becc" +Content-Length: 1199 +Content-Type: text/xml;charset=UTF-8 + + + + + /caldav.php/user1/home/ + + + 1425 + httpd/unix-directory + + + + + + HTTP/1.1 200 OK + + + + /caldav.php/user1/home/3F4CF6227300FD062D9EF3CDFB30D32D-0.ics + + + 705 + text/calendar + + + + + HTTP/1.1 200 OK + + + + /caldav.php/user1/home/F56B49B10FC923D20FE2DC92D6580340-0.ics + + + 720 + text/calendar + + + + + HTTP/1.1 200 OK + + + diff --git a/testing/tests/regression-suite/014-Mulberry-PUT-3.result b/testing/tests/regression-suite/014-Mulberry-PUT-3.result new file mode 100644 index 00000000..fba0710f --- /dev/null +++ b/testing/tests/regression-suite/014-Mulberry-PUT-3.result @@ -0,0 +1,7 @@ +HTTP/1.1 201 Replaced +Date: Dow, 01 Jan 2000 00:00:00 GMT +Server: Apache/2.2.3 (Debian) DAV/2 +ETag: "2c32a2f8aba853654eb17fe037a4db4d" +Content-length: 0 +Content-Type: text/html; charset=UTF-8 + diff --git a/testing/tests/regression-suite/015-Mulberry-PROPFIND-6.result b/testing/tests/regression-suite/015-Mulberry-PROPFIND-6.result new file mode 100644 index 00000000..49bdcd40 --- /dev/null +++ b/testing/tests/regression-suite/015-Mulberry-PROPFIND-6.result @@ -0,0 +1,50 @@ +HTTP/1.1 207 Multi-Status +Date: Dow, 01 Jan 2000 00:00:00 GMT +Server: Apache/2.2.3 (Debian) DAV/2 +ETag: "38ba0832b5ab1fd7147b102ceba0becc" +Content-Length: 1199 +Content-Type: text/xml;charset=UTF-8 + + + + + /caldav.php/user1/home/ + + + 1425 + httpd/unix-directory + + + + + + HTTP/1.1 200 OK + + + + /caldav.php/user1/home/3F4CF6227300FD062D9EF3CDFB30D32D-0.ics + + + 705 + text/calendar + + + + + HTTP/1.1 200 OK + + + + /caldav.php/user1/home/F56B49B10FC923D20FE2DC92D6580340-0.ics + + + 720 + text/calendar + + + + + HTTP/1.1 200 OK + + + diff --git a/testing/tests/regression-suite/102-Evo-REPORT-1.result b/testing/tests/regression-suite/102-Evo-REPORT-1.result index a58cbb3c..9f120952 100644 --- a/testing/tests/regression-suite/102-Evo-REPORT-1.result +++ b/testing/tests/regression-suite/102-Evo-REPORT-1.result @@ -1,8 +1,8 @@ HTTP/1.1 207 Multi-Status Date: Dow, 01 Jan 2000 00:00:00 GMT Server: Apache/2.2.3 (Debian) DAV/2 -ETag: "91cfe32724dec9ab3467d9f9aa4b4a66" -Content-Length: 341 +ETag: "999029ee508d00d69a8251bc727d6e52" +Content-Length: 600 Content-Type: text/xml;charset=UTF-8 @@ -16,4 +16,13 @@ Content-Type: text/xml;charset=UTF-8 HTTP/1.1 200 OK + + http://mycaldav/caldav.php/user1/home/3F4CF6227300FD062D9EF3CDFB30D32D-0.ics + + + "2c32a2f8aba853654eb17fe037a4db4d" + + HTTP/1.1 200 OK + + diff --git a/testing/tests/regression-suite/104-Evo-PUT-1.result b/testing/tests/regression-suite/104-Evo-PUT-1.result index a692f6e0..d0cbe6c5 100644 --- a/testing/tests/regression-suite/104-Evo-PUT-1.result +++ b/testing/tests/regression-suite/104-Evo-PUT-1.result @@ -3,7 +3,7 @@ HTTP/1.1 100 Continue HTTP/1.1 201 Created Date: Dow, 01 Jan 2000 00:00:00 GMT Server: Apache/2.2.3 (Debian) DAV/2 -ETag: "BogusEvolutionETagOnPUT256420453" +ETag: "c3658901fd4689d4a1e1d6f08601ef4f" Content-length: 0 Content-Type: text/html; charset=UTF-8 diff --git a/testing/tests/regression-suite/105-Evo-REPORT-1.result b/testing/tests/regression-suite/105-Evo-REPORT-1.result index 57c3b844..031bf2a3 100644 --- a/testing/tests/regression-suite/105-Evo-REPORT-1.result +++ b/testing/tests/regression-suite/105-Evo-REPORT-1.result @@ -1,8 +1,8 @@ HTTP/1.1 207 Multi-Status Date: Dow, 01 Jan 2000 00:00:00 GMT Server: Apache/2.2.3 (Debian) DAV/2 -ETag: "885993094fd55aca669806d0ca75fa14" -Content-Length: 582 +ETag: "aec354a7e336855131053ef08ca190b8" +Content-Length: 841 Content-Type: text/xml;charset=UTF-8 @@ -16,6 +16,15 @@ Content-Type: text/xml;charset=UTF-8 HTTP/1.1 200 OK + + http://mycaldav/caldav.php/user1/home/3F4CF6227300FD062D9EF3CDFB30D32D-0.ics + + + "2c32a2f8aba853654eb17fe037a4db4d" + + HTTP/1.1 200 OK + + http://mycaldav/caldav.php/user1/home/20061101T073004Z.ics