Merge pull request #90 from owncloud/update-travis-core-branch

Update the env.global.CORE_BRANCH setting in .travis.yml
owncloud · Mar 4, 2016 · 88bb39c · 88bb39c
2 parents 168d12d + ca6a458
commit 88bb39c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,7 +7,7 @@ php:
 
 env:
   global:
-    - CORE_BRANCH=master
+    - CORE_BRANCH=stable9
     - APP_NAME=files_antivirus
   matrix:
     - DB=sqlite

diff --git a/tests/cron/tasktest.php b/tests/cron/tasktest.php
@@ -19,7 +19,7 @@ public function setUp(){
 		$results = $userManager->search('', 1, 0);
 
 		if (!count($results)) {
-			\OC_User::createUser('test', 'test');
+			\OC::$server->getUserManager()->createUser('test', 'test');
 		}
 		$this->scannerFactory = new ScannerFactory(
 				$this->config,

diff --git a/tests/itemtest.php b/tests/itemtest.php
@@ -27,7 +27,7 @@ public function setUp() {
 		\OC\Files\Filesystem::clearMounts();
 
 		//login
-		\OC_User::createUser('test', 'test');
+		\OC::$server->getUserManager()->createUser('test', 'test');
 		\OC::$server->getSession()->set('user_id', 'test');
 
 		$this->storage = new \OC\Files\Storage\Temporary(array());

diff --git a/tests/scannertest.php b/tests/scannertest.php
@@ -46,7 +46,7 @@ public function setUp() {
 		$results = $userManager->search('', 1, 0);
 
 		if (!count($results)) {
-			\OC_User::createUser('test', 'test');
+			\OC::$server->getUserManager()->createUser('test', 'test');
 		}
 		$this->scannerFactory = new ScannerFactory(
 				$this->config,