From 76d411a6ab5795c6e0fc240029cb11d123d27135 Mon Sep 17 00:00:00 2001
From: Andrew McMillan <andrew@morphoss.com>
Date: Mon, 15 Mar 2010 14:57:13 +1300
Subject: [PATCH] Minor test/result changes.

---
 .../941-GET-resource-denied.result            | 74 ++++++++++---------
 .../tests/regression-suite/955-DELTICKET.test |  1 -
 testing/tests/regression-suite/960-GET.test   |  1 -
 3 files changed, 41 insertions(+), 35 deletions(-)

diff --git a/testing/tests/regression-suite/941-GET-resource-denied.result b/testing/tests/regression-suite/941-GET-resource-denied.result
index b96e3280..b9545650 100644
--- a/testing/tests/regression-suite/941-GET-resource-denied.result
+++ b/testing/tests/regression-suite/941-GET-resource-denied.result
@@ -2,38 +2,46 @@ HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy
 Etag: "c3658901fd4689d4a1e1d6f08601ef4f"
-Content-Length: 828
+Content-Length: 1059
 Content-Type: text/calendar; charset="utf-8"
 
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//Ximian//NONSGML Evolution Calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/softwarestudio.org/Olson_20011030_5/Pacific/Auckland
-X-LIC-LOCATION:Pacific/Auckland
-BEGIN:STANDARD
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
-TZNAME:NZST
-DTSTART:19700315T030000
-RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=3SU;BYMONTH=3
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1300
-TZNAME:NZDT
-DTSTART:19701004T020000
-RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=10
-END:DAYLIGHT
-END:VTIMEZONE
-BEGIN:VEVENT
-SUMMARY:Busy
-CLASS:CONFIDENTIAL
-DTSTART;TZID=/softwarestudio.org/Olson_20011030_5/Pacific/Auckland: 
- 20061101T100000
-DTEND;TZID=/softwarestudio.org/Olson_20011030_5/Pacific/Auckland: 
- 20061101T110000
-UID:20061101T073000Z-10468-1000-1-7@ubu
-END:VEVENT
-END:VCALENDAR
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Ximian//NONSGML Evolution Calendar//EN
+VERSION:2.0
+BEGIN:VEVENT
+UID:20061101T073000Z-10468-1000-1-7@ubu
+DTSTAMP:20061101T073000Z
+DTSTART;TZID=/softwarestudio.org/Olson_20011030_5/Pacific/Auckland:
+ 20061101T100000
+DTEND;TZID=/softwarestudio.org/Olson_20011030_5/Pacific/Auckland:
+ 20061101T110000
+SUMMARY:A Meeting
+X-EVOLUTION-CALDAV-HREF:http:
+ //user1@mycaldav/caldav.php/user1/home/20061101T073004Z.ics
+BEGIN:VALARM
+X-EVOLUTION-ALARM-UID:20061101T073000Z-10480-1000-1-5@ubu
+ACTION:DISPLAY
+TRIGGER;VALUE=DURATION;RELATED=START:-PT15M
+DESCRIPTION:A Meeting
+END:VALARM
+END:VEVENT
+BEGIN:VTIMEZONE
+TZID:/softwarestudio.org/Olson_20011030_5/Pacific/Auckland
+X-LIC-LOCATION:Pacific/Auckland
+BEGIN:STANDARD
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+TZNAME:NZST
+DTSTART:19700315T030000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=3SU;BYMONTH=3
+END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
+TZNAME:NZDT
+DTSTART:19701004T020000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=10
+END:DAYLIGHT
+END:VTIMEZONE
+END:VCALENDAR
diff --git a/testing/tests/regression-suite/955-DELTICKET.test b/testing/tests/regression-suite/955-DELTICKET.test
index d7c214e2..3910b60c 100644
--- a/testing/tests/regression-suite/955-DELTICKET.test
+++ b/testing/tests/regression-suite/955-DELTICKET.test
@@ -4,7 +4,6 @@
 TYPE=DELTICKET
 URL=http://regression.host/caldav.php/user1/home/4aaf8f37-f232-4c8e-a72e-e171d4c4fe54.ics
 HEADER=User-Agent: Ticket Spec Tests
-HEADER=Content-Type: text/xml; charset="UTF-8"
 HEAD
 
 # Get the ticket we created earlier in 950...
diff --git a/testing/tests/regression-suite/960-GET.test b/testing/tests/regression-suite/960-GET.test
index e676ffec..20f297eb 100644
--- a/testing/tests/regression-suite/960-GET.test
+++ b/testing/tests/regression-suite/960-GET.test
@@ -12,7 +12,6 @@ SELECT ticket_id FROM access_ticket
 ENDSQL
 
 HEADER=User-Agent: DAViCalTester/public
-HEADER=Content-Type: text/xml; charset="UTF-8"
 HEADER=Ticket: ##ticket##
 HEAD