From 079ae9b7a97a25497e0692dfc31eae831439f4f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Mon, 30 Nov 2015 10:41:34 +0100
Subject: [PATCH] Update addressbook home configuration for CalDAVTester

---
 apps/dav/tests/travis/caldavtest/config/serverinfo.xml |  2 +-
 .../travis/caldavtest/tests/CardDAV/sync-report.xml    | 10 +++++-----
 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>