From 10ed3ffc84c0bb0ae6642d9e15682b3680a33652 Mon Sep 17 00:00:00 2001 From: Florian Schlichting Date: Sun, 1 Jan 2017 20:44:07 +0100 Subject: [PATCH] misc changes to get more tests to pass Status: binding almost passes, carddav and scheduling have some issues, timezone seems hopeless (dependency on remote URL that is 404) --- testing/README.regression_tests | 4 +++- testing/run_regressions.sh | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/testing/README.regression_tests b/testing/README.regression_tests index cd9ea627..a5acfe3c 100644 --- a/testing/README.regression_tests +++ b/testing/README.regression_tests @@ -41,7 +41,7 @@ to /etc/hosts and a VirtualHost to Apache with RewriteRule ^/\.well-known/(.*)$ /caldav.php/.well-known/$1 [NC,L] # let caldav.php handle "anything else" RewriteCond %{REQUEST_URI} !^/$ - RewriteCond %{REQUEST_URI} !\.(php|css|png|gif|js|jpg) + RewriteCond %{REQUEST_URI} !\.(php|css|png|gif|js|jpg|ico) RewriteRule ^(.*)$ /caldav.php$1 [NC,L] @@ -60,6 +60,8 @@ former) with $c->hide_alarm = true; // some freebusy queries will be 404 otherwise $c->public_freebusy_url = true; + // helps with 1035-GET-mashup + $c->get_includes_subcollections = true; // for ischedule suite; also needs DKIM set up? $c->enable_scheduling = true; diff --git a/testing/run_regressions.sh b/testing/run_regressions.sh index 4f281eee..4630c013 100755 --- a/testing/run_regressions.sh +++ b/testing/run_regressions.sh @@ -11,7 +11,7 @@ # DBNAME=regression PGPOOL=inactive -HOSTNAME=regression +HOSTNAME=mycaldav # We need to run the regression tests in the timezone they were written for. export PGTZ=Pacific/Auckland