From bc1ef8b26c8e80b2ad7421bcd0d0b267d087f825 Mon Sep 17 00:00:00 2001 From: Andrew McMillan Date: Mon, 2 Sep 2013 14:18:11 +1200 Subject: [PATCH] ETag/path changes due to regression.host changes. --- .../regression-suite/0104-Evo-PUT-1.result | 2 +- .../regression-suite/0105-Evo-REPORT-1.result | 4 ++-- .../regression-suite/0106-Evo-GET-1.result | 6 ++--- .../regression-suite/0107-Evo-REPORT-1.result | 4 ++-- .../regression-suite/0108-Evo-REPORT-1.result | 4 ++-- .../regression-suite/0203-Moz-REPORT-2.result | 6 ++--- .../regression-suite/0247-Moz-PROPFIND.result | 4 ++-- .../0309-Chandler-PROPFIND-4.result | 4 ++-- .../0402-Cadaver-GET-1.result | 2 +- .../0520-iCal-PROPFIND.result | 4 ++-- .../0522-iCal-PROPFIND.result | 4 ++-- .../0537-iCal4-PROPFIND.result | 4 ++-- .../0903-GET-Collection.result | 22 +++++++++---------- 13 files changed, 35 insertions(+), 35 deletions(-) diff --git a/testing/tests/regression-suite/0104-Evo-PUT-1.result b/testing/tests/regression-suite/0104-Evo-PUT-1.result index b269dcf9..578d8b36 100644 --- a/testing/tests/regression-suite/0104-Evo-PUT-1.result +++ b/testing/tests/regression-suite/0104-Evo-PUT-1.result @@ -4,7 +4,7 @@ HTTP/1.1 201 Created Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy -ETag: "c3658901fd4689d4a1e1d6f08601ef4f" +ETag: "fdcc61a1e0d76b177ad81cf7c8bdacaf" Content-Length: 0 Content-Type: text/plain; charset="utf-8" diff --git a/testing/tests/regression-suite/0105-Evo-REPORT-1.result b/testing/tests/regression-suite/0105-Evo-REPORT-1.result index 14ca641f..eff854b7 100644 --- a/testing/tests/regression-suite/0105-Evo-REPORT-1.result +++ b/testing/tests/regression-suite/0105-Evo-REPORT-1.result @@ -2,7 +2,7 @@ HTTP/1.1 207 Multi-Status Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy -ETag: "ca51ab493acbf1f9847c2cd95ef33026" +ETag: "ea0a8074fa122b63b7fc56f521c96434" Content-Length: 552 Content-Type: text/xml; charset="utf-8" @@ -21,7 +21,7 @@ Content-Type: text/xml; charset="utf-8" /caldav.php/user1/home/20061101T073004Z.ics - "c3658901fd4689d4a1e1d6f08601ef4f" + "fdcc61a1e0d76b177ad81cf7c8bdacaf" HTTP/1.1 200 OK diff --git a/testing/tests/regression-suite/0106-Evo-GET-1.result b/testing/tests/regression-suite/0106-Evo-GET-1.result index bb8c89e8..736ed9c1 100644 --- a/testing/tests/regression-suite/0106-Evo-GET-1.result +++ b/testing/tests/regression-suite/0106-Evo-GET-1.result @@ -2,8 +2,8 @@ HTTP/1.1 200 OK Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy -Etag: "c3658901fd4689d4a1e1d6f08601ef4f" -Content-Length: 1099 +Etag: "fdcc61a1e0d76b177ad81cf7c8bdacaf" +Content-Length: 1106 Content-Type: text/calendar; charset="utf-8" BEGIN:VCALENDAR @@ -19,7 +19,7 @@ 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 + //user1@regression.host/caldav.php/user1/home/20061101T073004Z.ics BEGIN:VALARM X-EVOLUTION-ALARM-UID:20061101T073000Z-10480-1000-1-5@ubu ACTION:DISPLAY diff --git a/testing/tests/regression-suite/0107-Evo-REPORT-1.result b/testing/tests/regression-suite/0107-Evo-REPORT-1.result index 33368e95..f5457f43 100644 --- a/testing/tests/regression-suite/0107-Evo-REPORT-1.result +++ b/testing/tests/regression-suite/0107-Evo-REPORT-1.result @@ -2,7 +2,7 @@ HTTP/1.1 207 Multi-Status Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy -ETag: "060f992b9ee715662940929074dc1f57" +ETag: "a3bf80792b5272baa8cc1ed934b630b5" Content-Length: 530 Content-Type: text/xml; charset="utf-8" @@ -21,7 +21,7 @@ Content-Type: text/xml; charset="utf-8" /user1/home/20061101T073004Z.ics - "c3658901fd4689d4a1e1d6f08601ef4f" + "fdcc61a1e0d76b177ad81cf7c8bdacaf" HTTP/1.1 200 OK diff --git a/testing/tests/regression-suite/0108-Evo-REPORT-1.result b/testing/tests/regression-suite/0108-Evo-REPORT-1.result index 59c6f904..b6cde465 100644 --- a/testing/tests/regression-suite/0108-Evo-REPORT-1.result +++ b/testing/tests/regression-suite/0108-Evo-REPORT-1.result @@ -2,7 +2,7 @@ HTTP/1.1 207 Multi-Status Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy -ETag: "e68750266884dbc4ee9f96f85a8dc39c" +ETag: "ed202b0bb2fb5fd4d423f1e995b56d1d" Content-Length: 568 Content-Type: text/xml; charset="utf-8" @@ -21,7 +21,7 @@ Content-Type: text/xml; charset="utf-8" /davical/caldav.php/user1/home/20061101T073004Z.ics - "c3658901fd4689d4a1e1d6f08601ef4f" + "fdcc61a1e0d76b177ad81cf7c8bdacaf" HTTP/1.1 200 OK diff --git a/testing/tests/regression-suite/0203-Moz-REPORT-2.result b/testing/tests/regression-suite/0203-Moz-REPORT-2.result index 81f1d9a1..425bded6 100644 --- a/testing/tests/regression-suite/0203-Moz-REPORT-2.result +++ b/testing/tests/regression-suite/0203-Moz-REPORT-2.result @@ -2,8 +2,8 @@ HTTP/1.1 207 Multi-Status Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy -ETag: "29e2f219a0c62c391b207758292e7aef" -Content-Length: 2362 +ETag: "76210f92f7ec88b1464ca3a5e2f4ae90" +Content-Length: 2369 Content-Type: text/xml; charset="utf-8" @@ -67,7 +67,7 @@ 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 + //user1@regression.host/caldav.php/user1/home/20061101T073004Z.ics BEGIN:VALARM X-EVOLUTION-ALARM-UID:20061101T073000Z-10480-1000-1-5@ubu ACTION:DISPLAY diff --git a/testing/tests/regression-suite/0247-Moz-PROPFIND.result b/testing/tests/regression-suite/0247-Moz-PROPFIND.result index 6a3b8892..a5fd0174 100644 --- a/testing/tests/regression-suite/0247-Moz-PROPFIND.result +++ b/testing/tests/regression-suite/0247-Moz-PROPFIND.result @@ -2,7 +2,7 @@ HTTP/1.1 207 Multi-Status Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy -ETag: "daf491bbb56b3cc971668f69638f25d0" +ETag: "8ea04cfcf16d0c3ec23b67c6a479cce4" Content-Length: 4293 Content-Type: text/xml; charset="utf-8" @@ -44,7 +44,7 @@ Content-Type: text/xml; charset="utf-8" text/calendar - "c3658901fd4689d4a1e1d6f08601ef4f" + "fdcc61a1e0d76b177ad81cf7c8bdacaf" HTTP/1.1 200 OK diff --git a/testing/tests/regression-suite/0309-Chandler-PROPFIND-4.result b/testing/tests/regression-suite/0309-Chandler-PROPFIND-4.result index 8486476d..7a048ca9 100644 --- a/testing/tests/regression-suite/0309-Chandler-PROPFIND-4.result +++ b/testing/tests/regression-suite/0309-Chandler-PROPFIND-4.result @@ -2,7 +2,7 @@ HTTP/1.1 207 Multi-Status Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy -ETag: "2e9da41da3450d7ccfe49fb10bb32c62" +ETag: "f25fd085ce4c1a71d898cd784374673e" Content-Length: 4287 Content-Type: text/xml; charset="utf-8" @@ -42,7 +42,7 @@ Content-Type: text/xml; charset="utf-8" /caldav.php/user1/home/20061101T073004Z.ics - "c3658901fd4689d4a1e1d6f08601ef4f" + "fdcc61a1e0d76b177ad81cf7c8bdacaf" A Meeting diff --git a/testing/tests/regression-suite/0402-Cadaver-GET-1.result b/testing/tests/regression-suite/0402-Cadaver-GET-1.result index 35214626..1e336e34 100644 --- a/testing/tests/regression-suite/0402-Cadaver-GET-1.result +++ b/testing/tests/regression-suite/0402-Cadaver-GET-1.result @@ -11,7 +11,7 @@ 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 + //user1@regression.host/caldav.php/user1/home/20061101T073004Z.ics BEGIN:VALARM X-EVOLUTION-ALARM-UID:20061101T073000Z-10480-1000-1-5@ubu ACTION:DISPLAY diff --git a/testing/tests/regression-suite/0520-iCal-PROPFIND.result b/testing/tests/regression-suite/0520-iCal-PROPFIND.result index 06eff974..b3f6d506 100644 --- a/testing/tests/regression-suite/0520-iCal-PROPFIND.result +++ b/testing/tests/regression-suite/0520-iCal-PROPFIND.result @@ -2,7 +2,7 @@ HTTP/1.1 207 Multi-Status Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy -ETag: "9b4a5104ccdf29c1ff158b1463f41d5c" +ETag: "33b0340c78ada46352f5c85203b166f1" Content-Length: 1354 Content-Type: text/xml; charset="utf-8" @@ -12,7 +12,7 @@ Content-Type: text/xml; charset="utf-8" /caldav.php/user2/.in/ - "0389feae460444b4b5db3b16c94b1e43" + "21af9d4e6b2213058ebcbdcae1d922e5" User 2 Inbox diff --git a/testing/tests/regression-suite/0522-iCal-PROPFIND.result b/testing/tests/regression-suite/0522-iCal-PROPFIND.result index ce24374e..0fb5b144 100644 --- a/testing/tests/regression-suite/0522-iCal-PROPFIND.result +++ b/testing/tests/regression-suite/0522-iCal-PROPFIND.result @@ -2,7 +2,7 @@ HTTP/1.1 207 Multi-Status Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy -ETag: "8ae10873cb1929fd0e66571128cf01ea" +ETag: "f82d0d6095e7f51a9f5c5479f3d2c3c7" Content-Length: 4594 Content-Type: text/xml; charset="utf-8" @@ -87,7 +87,7 @@ Content-Type: text/xml; charset="utf-8" /caldav.php/user2/.in/ - "0389feae460444b4b5db3b16c94b1e43" + "21af9d4e6b2213058ebcbdcae1d922e5" User 2 Inbox diff --git a/testing/tests/regression-suite/0537-iCal4-PROPFIND.result b/testing/tests/regression-suite/0537-iCal4-PROPFIND.result index 6b6ffef5..e3018141 100644 --- a/testing/tests/regression-suite/0537-iCal4-PROPFIND.result +++ b/testing/tests/regression-suite/0537-iCal4-PROPFIND.result @@ -2,7 +2,7 @@ HTTP/1.1 207 Multi-Status Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy -ETag: "1e225088c56c4098da7aadf1f844d028" +ETag: "854b5a1ef15e478614bce748162bb3f7" Content-Length: 767 Content-Type: text/xml; charset="utf-8" @@ -12,7 +12,7 @@ Content-Type: text/xml; charset="utf-8" /caldav.php/user1/.in/ - "0389feae460444b4b5db3b16c94b1e43" + "21af9d4e6b2213058ebcbdcae1d922e5" diff --git a/testing/tests/regression-suite/0903-GET-Collection.result b/testing/tests/regression-suite/0903-GET-Collection.result index 9d08508d..056fa149 100644 --- a/testing/tests/regression-suite/0903-GET-Collection.result +++ b/testing/tests/regression-suite/0903-GET-Collection.result @@ -3,7 +3,7 @@ Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy Etag: "f9a8ee6b41d9b02aa5176e6da349121a" -Content-Length: 24817 +Content-Length: 24852 Content-Type: text/calendar; charset="utf-8" BEGIN:VCALENDAR @@ -55,8 +55,8 @@ DTSTART;TZID=/softwarestudio.org/Olson_20011030_5/Pacific/Auckland:20060 DTEND;TZID=/softwarestudio.org/Olson_20011030_5/Pacific/Auckland:2006091 9T120000 SUMMARY:NGOP Meeting -X-EVOLUTION-CALDAV-HREF:http://mycaldav:80/caldav.php/andrew/20060905T23 - 1053Z.ics +X-EVOLUTION-CALDAV-HREF:http://regression.host:80/caldav.php/andrew/2006 + 0905T231053Z.ics X-EVOLUTION-CALDAV-ETAG:"4d37ed48425acb9f4245539e2d2b726b" X-EVOLUTION-MOVE-CALENDAR:1 CREATED:20060907T093732 @@ -79,8 +79,8 @@ DTSTART;TZID=/softwarestudio.org/Olson_20011030_5/Pacific/Auckland:20060 DTEND;TZID=/softwarestudio.org/Olson_20011030_5/Pacific/Auckland:2006091 1T120000 SUMMARY:NGOP by-election readiness. -X-EVOLUTION-CALDAV-HREF:http://mycaldav:80/caldav.php/andrew/20060906T12 - 3515Z.ics +X-EVOLUTION-CALDAV-HREF:http://regression.host:80/caldav.php/andrew/2006 + 0906T123515Z.ics X-EVOLUTION-CALDAV-ETAG:"9a39bedee743f397ebeeda78a4233c8b" X-EVOLUTION-MOVE-CALENDAR:1 CREATED:20060907T093748 @@ -130,8 +130,8 @@ TRANSP:OPAQUE SEQUENCE:5 SUMMARY:9:am - 2:30pm in Helsinki CLASS:PUBLIC -X-EVOLUTION-CALDAV-HREF:http://mycaldav:80/caldav.php/andrew/20060912T23 - 3500Z.ics +X-EVOLUTION-CALDAV-HREF:http://regression.host:80/caldav.php/andrew/2006 + 0912T233500Z.ics X-EVOLUTION-CALDAV-ETAG:"8d8ca5e838b7e088bf17d9916032eec6" X-EVOLUTION-MOVE-CALENDAR:1 CREATED:20060913T003545 @@ -151,8 +151,8 @@ DTSTART;TZID=/softwarestudio.org/Olson_20011030_5/Pacific/Auckland:20060 DTEND;TZID=/softwarestudio.org/Olson_20011030_5/Pacific/Auckland:2006091 8T150000 SUMMARY:Donovan -X-EVOLUTION-CALDAV-HREF:http://mycaldav:80/caldav.php/andrew/20060914T21 - 2516Z.ics +X-EVOLUTION-CALDAV-HREF:http://regression.host:80/caldav.php/andrew/2006 + 0914T212516Z.ics X-EVOLUTION-CALDAV-ETAG:"004c7b3de49835f714ae7962e8d06d3c" X-EVOLUTION-MOVE-CALENDAR:1 CREATED:20060914T213552 @@ -221,8 +221,8 @@ DTSTART;TZID=/softwarestudio.org/Olson_20011030_5/Pacific/Auckland:20060 DTEND;TZID=/softwarestudio.org/Olson_20011030_5/Pacific/Auckland:2006092 1T170000 SUMMARY:Really Geeky Thoughts -X-EVOLUTION-CALDAV-HREF:http://andrew@mycaldav/caldav.php/andrew/2006092 - 0T052710Z.ics +X-EVOLUTION-CALDAV-HREF:http://andrew@regression.host/caldav.php/andrew/ + 20060920T052710Z.ics X-EVOLUTION-CALDAV-ETAG:"d9a4a80a3dbc76b947a3bf0f0672359c" X-EVOLUTION-MOVE-CALENDAR:1 CREATED:20060920T052722