summaryrefslogtreecommitdiffstats
path: root/apps/dav
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2015-11-30 10:41:34 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2015-12-02 09:14:41 +0100
commit079ae9b7a97a25497e0692dfc31eae831439f4f1 (patch)
treef77876e5f425f223998be5720463b09f6f57a3c6 /apps/dav
parent6a2dde64009fdffc6483b920717721634348a12f (diff)
downloadnextcloud-server-079ae9b7a97a25497e0692dfc31eae831439f4f1.tar.gz
nextcloud-server-079ae9b7a97a25497e0692dfc31eae831439f4f1.zip
Update addressbook home configuration for CalDAVTester
Diffstat (limited to 'apps/dav')
-rw-r--r--apps/dav/tests/travis/caldavtest/config/serverinfo.xml2
-rw-r--r--apps/dav/tests/travis/caldavtest/tests/CardDAV/sync-report.xml10
2 files changed, 6 insertions, 6 deletions
diff --git a/apps/dav/tests/travis/caldavtest/config/serverinfo.xml b/apps/dav/tests/travis/caldavtest/config/serverinfo.xml
index a474bb7135c..c80e47f9481 100644
--- a/apps/dav/tests/travis/caldavtest/config/serverinfo.xml
+++ b/apps/dav/tests/travis/caldavtest/config/serverinfo.xml
@@ -569,7 +569,7 @@
<!-- relative path to user addressbook home-->
<substitution>
<key>$addressbookhome%d:</key>
- <value>$addressbooks:$userid%d:</value>
+ <value>$addressbooks:users/$userid%d:</value>
</substitution>
<!-- relative path to user addressbook-->
<substitution>
diff --git a/apps/dav/tests/travis/caldavtest/tests/CardDAV/sync-report.xml b/apps/dav/tests/travis/caldavtest/tests/CardDAV/sync-report.xml
index 0321e61edbc..ffa6662981c 100644
--- a/apps/dav/tests/travis/caldavtest/tests/CardDAV/sync-report.xml
+++ b/apps/dav/tests/travis/caldavtest/tests/CardDAV/sync-report.xml
@@ -181,8 +181,7 @@
</verify>
</request>
</test>
- <!--
- <test name='6'>
+ <!-- test name='6'>
<require-feature>
<feature>sync-report-home</feature>
</require-feature>
@@ -236,7 +235,7 @@
</arg>
</verify>
</request>
- </test>
+ </test -->
<test name='8'>
<description>remove new resource</description>
<request>
@@ -264,14 +263,15 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
- <value>$calendar_sync_extra_items:</value>
+ <!-- no sync on addressbook level -->
+ <!--<value>$calendar_sync_extra_items:</value>-->
<value>1.vcf</value>
<value>2.vcf</value>
</arg>
</verify>
</request>
</test>
- <test name='10'>
+ <!--test name='10'>
<require-feature>
<feature>sync-report-home</feature>
</require-feature>