From 1541af432e2bb2920bea8d3a2149cdd13db072d7 Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Mon, 19 Feb 2018 20:10:23 +0100
Subject: [PATCH] Use a proper wait for create of the container

* Also create a test file so we know for sure it all works

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
---
 .drone.yml                      |  3 +--
 tests/drone-wait-objectstore.sh | 29 +++++++++++++++++++++++++++--
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 1c7eba5f0f..9a0e7b2548 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -851,9 +851,8 @@ services:
         matrix:
           OBJECT_STORE: s3
   dockswift:
-      image: icewind1991/dockswift
+      image: icewind1991/dockswift:nextcloud-ci
       environment:
-      - INITIALIZE=yes
       - IPADDRESS=dockswift
       when:
         matrix:
diff --git a/tests/drone-wait-objectstore.sh b/tests/drone-wait-objectstore.sh
index f1d9faad7a..228accc3da 100755
--- a/tests/drone-wait-objectstore.sh
+++ b/tests/drone-wait-objectstore.sh
@@ -30,7 +30,32 @@ if [ "$OBJECT_STORE" == "swift" ]; then
 
     sleep 2
 
-    curl curl -s -X PUT -H "X-Auth-Token: $SWIFT_TOKEN" "$SWIFT_ENDPOINT/nextcloud"
+    while [ 1 ]
+    do
+        sleep 2
 
-    sleep 2
+        respCode=$(curl -s -o /dev/null -w "%{http_code}" -X PUT -H "X-Auth-Token: $SWIFT_TOKEN" "$SWIFT_ENDPOINT/nextcloud")
+
+        if [ "$respCode" == "201" ]
+        then
+            break
+        fi
+    done
+
+    echo "creating test file"
+
+    while [ 1 ]
+    do
+        sleep 2
+
+        respCode=$(curl -s -o /dev/null -w "%{http_code}" -X PUT -H "X-Auth-Token: $SWIFT_TOKEN" -H "Content-Type: text/html; charset=UTF-8" -d "Hello world" "$SWIFT_ENDPOINT/nextcloud/helloworld.txt")
+
+        if [ "$respCode" == "201" ]
+        then
+            break
+        fi
+    done
+
+    echo "deleting test file"
+    curl -s -o /dev/null -w "%{http_code}\n" -X DELETE -H "X-Auth-Token: $SWIFT_TOKEN" "$SWIFT_ENDPOINT/nextcloud/helloworld.txt"
 fi