From 527acb261705966c5b42c0296a673c6a0eb533d0 Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer <markus@unterwaditzer.net>
Date: Wed, 14 Jun 2017 17:46:53 +0200
Subject: [PATCH] Disable tests for xandikos on pypy3

---
 .travis.yml                | 20 ++++----------------
 scripts/make_travisconf.py |  4 +++-
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index fa8e7fb..ed4c33a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -104,10 +104,6 @@
         "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=release BUILD_PRS=true ",
         "python": "3.6"
       },
-      {
-        "env": "BUILD=test DAV_SERVER=xandikos REQUIREMENTS=release BUILD_PRS=true ",
-        "python": "3.6"
-      },
       {
         "env": "BUILD=test DAV_SERVER=owncloud REQUIREMENTS=release BUILD_PRS=true ",
         "python": "3.6"
@@ -132,6 +128,10 @@
         "env": "BUILD=test DAV_SERVER=fastmail REQUIREMENTS=release BUILD_PRS=false ",
         "python": "3.6"
       },
+      {
+        "env": "BUILD=test DAV_SERVER=xandikos REQUIREMENTS=release BUILD_PRS=true ",
+        "python": "3.6"
+      },
       {
         "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=minimal BUILD_PRS=true ",
         "python": "3.6"
@@ -144,26 +144,14 @@
         "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=devel BUILD_PRS=true ",
         "python": "pypy3"
       },
-      {
-        "env": "BUILD=test DAV_SERVER=xandikos REQUIREMENTS=devel BUILD_PRS=true ",
-        "python": "pypy3"
-      },
       {
         "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=release BUILD_PRS=true ",
         "python": "pypy3"
       },
-      {
-        "env": "BUILD=test DAV_SERVER=xandikos REQUIREMENTS=release BUILD_PRS=true ",
-        "python": "pypy3"
-      },
       {
         "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=minimal BUILD_PRS=true ",
         "python": "pypy3"
       },
-      {
-        "env": "BUILD=test DAV_SERVER=xandikos REQUIREMENTS=minimal BUILD_PRS=true ",
-        "python": "pypy3"
-      },
       {
         "env": "BUILD=test ETESYNC_TESTS=true REQUIREMENTS=latest BUILD_PRS=true ",
         "python": "3.6"
diff --git a/scripts/make_travisconf.py b/scripts/make_travisconf.py
index 80a6694..7877555 100644
--- a/scripts/make_travisconf.py
+++ b/scripts/make_travisconf.py
@@ -46,11 +46,13 @@ matrix.append({
 
 for python, requirements in itertools.product(python_versions,
                                               ("devel", "release", "minimal")):
-    dav_servers = ("radicale", "xandikos")
+    dav_servers = ("radicale",)
     rs_servers = ()
     if python == latest_python and requirements == "release":
         dav_servers += ("owncloud", "nextcloud", "baikal", "davical", "icloud",
                         "fastmail")
+    if python != "pypy3":
+        dav_servers += ("xandikos",)
 
     for server_type, server in itertools.chain(
         (("REMOTESTORAGE", x) for x in rs_servers),