From 7a3adb676488e5f3f472934d56371b9b77ee7933 Mon Sep 17 00:00:00 2001
From: Andrew McMillan <andrew@morphoss.com>
Date: Fri, 26 Feb 2010 13:39:05 +1300
Subject: [PATCH] Stop these regression tests prompting me when they haven't
 really changed.

---
 testing/tests/regression-suite/221-Moz-PROPFIND.result | 4 ++--
 testing/tests/regression-suite/221-Moz-PROPFIND.test   | 3 +++
 testing/tests/regression-suite/924-MOVE.result         | 4 ++--
 testing/tests/regression-suite/924-MOVE.test           | 3 ++-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/testing/tests/regression-suite/221-Moz-PROPFIND.result b/testing/tests/regression-suite/221-Moz-PROPFIND.result
index c8d095a2..890102f4 100644
--- a/testing/tests/regression-suite/221-Moz-PROPFIND.result
+++ b/testing/tests/regression-suite/221-Moz-PROPFIND.result
@@ -1,7 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy
-ETag: "cf47b2d3fca4589724c229b9e15accb4"
+ETag: "Looks like a good ETAG to me :-)"
 Content-Length: 514
 Content-Type: text/xml; charset="utf-8"
 
@@ -18,7 +18,7 @@ Content-Type: text/xml; charset="utf-8"
     <owner>
      <href>/caldav.php/user5/</href>
     </owner>
-    <C1:getctag>"ce0d2291b1997c04cbc9d686d8cc3b40"</C1:getctag>
+    <C1:getctag>"Looks like a good CTAG to me :-)"</C1:getctag>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
diff --git a/testing/tests/regression-suite/221-Moz-PROPFIND.test b/testing/tests/regression-suite/221-Moz-PROPFIND.test
index b96ec323..b125f53e 100644
--- a/testing/tests/regression-suite/221-Moz-PROPFIND.test
+++ b/testing/tests/regression-suite/221-Moz-PROPFIND.test
@@ -22,3 +22,6 @@ BEGINDATA
   </D:prop>
 </D:propfind>
 ENDDATA
+
+REPLACE=!<C1:getctag>"[a-z0-9]+"</C1:getctag>!<C1:getctag>"Looks like a good CTAG to me :-)"</C1:getctag>!
+REPLACE=!^ETag: "[a-z0-9]+"!ETag: "Looks like a good ETAG to me :-)"!
diff --git a/testing/tests/regression-suite/924-MOVE.result b/testing/tests/regression-suite/924-MOVE.result
index d1eef03e..be7f0bb1 100644
--- a/testing/tests/regression-suite/924-MOVE.result
+++ b/testing/tests/regression-suite/924-MOVE.result
@@ -5,9 +5,9 @@ Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
 
-    cd_collection: >2695<
+    cd_collection: >1396<
        cd_user_no: >10<
-    ci_collection: >2695<
+    ci_collection: >1396<
        ci_user_no: >10<
         data_name: >/user1/entire/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics<
         item_name: >/user1/entire/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics<
diff --git a/testing/tests/regression-suite/924-MOVE.test b/testing/tests/regression-suite/924-MOVE.test
index ae992eac..f8e53ec5 100644
--- a/testing/tests/regression-suite/924-MOVE.test
+++ b/testing/tests/regression-suite/924-MOVE.test
@@ -15,6 +15,7 @@ SELECT caldav_data.dav_name AS data_name, calendar_item.dav_name AS item_name,
        caldav_data.collection_id AS cd_collection,
        calendar_item.collection_id AS ci_collection
 FROM caldav_data JOIN calendar_item USING(dav_id)
-WHERE caldav_data.dav_name ~ 'DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics';
+WHERE caldav_data.dav_name ~ 'DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics'
+ ORDER BY cd_collection;
 ENDQUERY