From 8565277623899f6bfcaaf19a7c379c0bd8a352ac Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer <markus@unterwaditzer.net>
Date: Sun, 13 Aug 2017 14:25:40 +0200
Subject: [PATCH] Revert "Disable iCloud tests"

This reverts commit b7e7cfc4396d3a2e4cc1de08cd8da4c18a957f3c.

See #646
---
 .travis.yml                | 4 ++++
 docs/tutorials/icloud.rst  | 6 +-----
 scripts/make_travisconf.py | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index cc20b1d..75b44fd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -124,6 +124,10 @@
         "env": "BUILD=test DAV_SERVER=davical REQUIREMENTS=release BUILD_PRS=false ",
         "python": "3.6"
       },
+      {
+        "env": "BUILD=test DAV_SERVER=icloud REQUIREMENTS=release BUILD_PRS=false ",
+        "python": "3.6"
+      },
       {
         "env": "BUILD=test DAV_SERVER=fastmail REQUIREMENTS=release BUILD_PRS=false ",
         "python": "3.6"
diff --git a/docs/tutorials/icloud.rst b/docs/tutorials/icloud.rst
index 1984190..c79b59f 100644
--- a/docs/tutorials/icloud.rst
+++ b/docs/tutorials/icloud.rst
@@ -4,11 +4,7 @@
 iCloud
 ======
 
-Vdirsyncer is tested against iCloud_.
-
-.. note::
-
-    Automated testing against iCloud is broken! See :gh:`646`.
+Vdirsyncer is regularly tested against iCloud_.
 
 ::
 
diff --git a/scripts/make_travisconf.py b/scripts/make_travisconf.py
index 1988198..71ac95a 100644
--- a/scripts/make_travisconf.py
+++ b/scripts/make_travisconf.py
@@ -49,7 +49,7 @@ for python, requirements in itertools.product(python_versions,
     dav_servers = ("radicale", "xandikos")
 
     if python == latest_python and requirements == "release":
-        dav_servers += ("owncloud", "nextcloud", "baikal", "davical",
+        dav_servers += ("owncloud", "nextcloud", "baikal", "davical", "icloud",
                         "fastmail")
 
     for dav_server in dav_servers: