Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/jsxc.nextcloud.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus <klaus@jsxc.org>2017-06-29 12:08:18 +0300
committerGitHub <noreply@github.com>2017-06-29 12:08:18 +0300
commitf3c43291c4b2e1b8125e64c2753fcdef1b76ff5f (patch)
tree39719cf2294ae3eebdab5f782e849f15df0f1961 /tests/integration
parent4a5fea6ad3d6b0ac1d70871c13f817d6cfdd88a2 (diff)
fix travis (#20)
* remove oc travis stuff * Fix integration tests and bump max-version * Fix stable11 and stable9 * Add stable12
Diffstat (limited to 'tests/integration')
-rw-r--r--tests/integration/DbLockTest.php14
1 files changed, 10 insertions, 4 deletions
diff --git a/tests/integration/DbLockTest.php b/tests/integration/DbLockTest.php
index f378537..d157b48 100644
--- a/tests/integration/DbLockTest.php
+++ b/tests/integration/DbLockTest.php
@@ -33,6 +33,12 @@ class DbLockTest extends TestCase {
*/
private $con;
+
+ /**
+ * @var \OCP\AppFramework\IAppContainer
+ */
+ private $container;
+
public function setUp() {
parent::setUp();
$app = new Application();
@@ -50,8 +56,8 @@ class DbLockTest extends TestCase {
$time = 4;
$this->dbLock = new DbLock(
'john',
- $this->container->getServer()->getDb(),
- $this->container->getServer()->getConfig()
+ $this->container->getServer()->getConfig(),
+ $this->container->getServer()->getDatabaseConnection()
);
$this->dbLock->setLock();
$result = $this->fetchLocks();
@@ -66,8 +72,8 @@ class DbLockTest extends TestCase {
$time = 5;
$this->dbLock2 = new DbLock(
'john',
- $this->container->getServer()->getDb(),
- $this->container->getServer()->getConfig()
+ $this->container->getServer()->getConfig(),
+ $this->container->getServer()->getDatabaseConnection()
); // simulate new lock/request
$this->dbLock2->setLock();