fix merge conflicts

1 files changed, 32 insertions, 0 deletions

diff --git a/apps/files_external/tests/swift.php b/apps/files_external/tests/swift.php
new file mode 100644
index 00000000000..f0bde6ed605
--- /dev/null
+++ b/apps/files_external/tests/swift.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+$config=include('apps/files_external/tests/config.php');
+if(!is_array($config) or !isset($config['swift']) or !$config['swift']['run']){
+	abstract class Test_Filestorage_SWIFT extends Test_FileStorage{}
+	return;
+}else{
+	class Test_Filestorage_SWIFT extends Test_FileStorage {
+		private $config;
+		private $id;
+
+		public function setUp(){
+			$id=uniqid();
+			$this->config=include('apps/files_external/tests/config.php');
+			$this->config['swift']['root'].='/'.$id;//make sure we have an new empty folder to work in
+			$this->instance=new OC_Filestorage_SWIFT($this->config['swift']);
+		}
+
+		
+		public function tearDown(){
+		    $this->instance->rmdir('');
+		}
+		
+	}
+}
+