From 8c01c83e4b56f89198e09037f44dad5f012f6986 Mon Sep 17 00:00:00 2001
From: Andrew Ruthven <puck@catalyst.net.nz>
Date: Fri, 30 Nov 2018 15:02:53 +1300
Subject: [PATCH] Ignore the id in our test comparision

Gitlab CI has a different collection_id for US Holidays than running
the tests locally. We don't actually care about ID for this test,
just the fact that the binding is present is enough for us.
---
 testing/tests/binding/1004-PROPFIND-bound.result | 14 +++++++-------
 testing/tests/binding/1004-PROPFIND-bound.test   |  2 ++
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/testing/tests/binding/1004-PROPFIND-bound.result b/testing/tests/binding/1004-PROPFIND-bound.result
index 37563f12..509f8fea 100644
--- a/testing/tests/binding/1004-PROPFIND-bound.result
+++ b/testing/tests/binding/1004-PROPFIND-bound.result
@@ -6,7 +6,7 @@
    <prop>
     <displayname>User 4</displayname>
     <resource-id>
-     <href>/caldav.php/.resources/1005</href>
+     <href>/caldav.php/.resources/XX</href>
     </resource-id>
     <parent-set>
      <parent>
@@ -24,7 +24,7 @@
    <prop>
     <displayname>User 2's Calendar, as uploaded by Admin</displayname>
     <resource-id>
-     <href>/caldav.php/.resources/161</href>
+     <href>/caldav.php/.resources/XX</href>
     </resource-id>
     <parent-set>
      <parent>
@@ -46,7 +46,7 @@
    <prop>
     <displayname>mir-test</displayname>
     <resource-id>
-     <href>/caldav.php/.resources/163</href>
+     <href>/caldav.php/.resources/XX</href>
     </resource-id>
     <parent-set>
      <parent>
@@ -64,7 +64,7 @@
    <prop>
     <displayname>user4 addresses</displayname>
     <resource-id>
-     <href>/caldav.php/.resources/463</href>
+     <href>/caldav.php/.resources/XX</href>
     </resource-id>
     <parent-set>
      <parent>
@@ -82,7 +82,7 @@
    <prop>
     <displayname>New Zealand Public Holidays</displayname>
     <resource-id>
-     <href>/caldav.php/.resources/1014</href>
+     <href>/caldav.php/.resources/XX</href>
     </resource-id>
     <parent-set>
      <parent>
@@ -100,7 +100,7 @@
    <prop>
     <displayname>US Holidays</displayname>
     <resource-id>
-     <href>/caldav.php/.resources/1069</href>
+     <href>/caldav.php/.resources/XX</href>
     </resource-id>
     <parent-set>
      <parent>
@@ -118,7 +118,7 @@
    <prop>
     <displayname>User 4 Outbox</displayname>
     <resource-id>
-     <href>/caldav.php/.resources/1600</href>
+     <href>/caldav.php/.resources/XX</href>
     </resource-id>
     <parent-set>
      <parent>
diff --git a/testing/tests/binding/1004-PROPFIND-bound.test b/testing/tests/binding/1004-PROPFIND-bound.test
index 9e672853..c92b2901 100644
--- a/testing/tests/binding/1004-PROPFIND-bound.test
+++ b/testing/tests/binding/1004-PROPFIND-bound.test
@@ -22,3 +22,5 @@ BEGINDATA
 ENDDATA
 
 #  <current-user-privilege-set/>
+
+REPLACE=_resources/\d+_resources/XX_