Changed unit test env var names

This commit is contained in:
Marcos Zuriaga 2016-10-11 22:33:48 +02:00
parent efd27ee1ae
commit 3f2bb33ce3
No known key found for this signature in database
GPG key ID: 7D15585354D072FF
2 changed files with 4 additions and 4 deletions

View file

@ -1,8 +1,8 @@
#!/bin/bash
# Setup your testing environment paths
export NEXTCLOUD_BASE_DIR=/var/www/html/nextcloud/
export NEXTCLOUD_CONFIG_DIR=/var/www/html/nextcloud/config/
export NEXTCLOUD_CONFIG_FILE=config.php
export SERVER_BASE_DIR=/var/www/html/nextcloud/
export SERVER_CONFIG_DIR=/var/www/html/nextcloud/config/
export SERVER_CONFIG_FILE=config.php
# Lanuch the actual tests
phpunit $@

View file

@ -40,7 +40,7 @@ abstract class DatabaseHelperTest extends PHPUnit_Extensions_Database_TestCase {
}
public function setUp() {
$server = new \OC\Server(getenv('NEXTCLOUD_BASE_DIR'), new \OC\Config(getenv('NEXTCLOUD_CONFIG_DIR'), getenv('NEXTCLOUD_CONFIG_FILE')));
$server = new \OC\Server(getenv('SERVER_BASE_DIR'), new \OC\Config(getenv('SERVER_CONFIG_DIR'), getenv('SERVER_CONFIG_FILE')));
$this->app_container = $server->getAppContainer('passman');
$this->db = $this->app_container->getServer()->getDatabaseConnection();