From 4ee4d15f012c87ef26ac42b4150c6200dc6b81ff Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Thu, 17 Aug 2017 09:40:12 +0200
Subject: [PATCH] Enable object storage tests again
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
---
.drone.yml | 4 ++--
tests/preseed-config.php | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.drone.yml b/.drone.yml
index 923eaa27d1f..a3bccf029de 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -773,8 +773,8 @@ matrix:
- TESTS: caldavtester-new-endpoint
- TESTS: carddavtester-new-endpoint
- TESTS: carddavtester-old-endpoint
-# - TESTS: object-store
-# OBJECT_STORE: s3
+ - TESTS: object-store
+ OBJECT_STORE: s3
- TESTS: sqlite-php7.0-samba-native
- TESTS: sqlite-php7.0-samba-non-native
- TEST: memcache-memcached
diff --git a/tests/preseed-config.php b/tests/preseed-config.php
index 953dfb7ee25..7c080038734 100644
--- a/tests/preseed-config.php
+++ b/tests/preseed-config.php
@@ -26,7 +26,7 @@ if (getenv('OBJECT_STORE') === 's3') {
'autocreate' => true,
'key' => 'dummy',
'secret' => 'dummy',
- 'hostname' => 'localhost',
+ 'hostname' => getenv('DRONE') === 'true' ? 'fake-s3' : 'localhost',
'port' => 4569,
'use_ssl' => false,
// required for some non amazon s3 implementations
--
GitLab