aviat
/
Query
1
1
Fork 0
Code Issues 1 Pull Requests Releases 2 Activity

Install missing apt package for docker, fix an issue running on jenkins

This commit is contained in:
Timothy Warren 2016-07-15 16:17:49 -04:00
parent d5f7e4274d
commit bcfb0f2be8
5 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/docker_install.sh
View File

@ -6,7 +6,9 @@
set -xe set -xe
# Install git (the php image doesn't have it) which is required by composer # Install git (the php image doesn't have it) which is required by composer
# And for some reason apt-utils is not installed
apt-get update -yqq apt-get update -yqq
apt-get install apt-utils
apt-get install git sqlite -yqq apt-get install git sqlite -yqq
# Install phpunit, the tool that we will use for testing # Install phpunit, the tool that we will use for testing

2
tests/databases/mysql/MySQLQBTest.php
View File

@ -21,7 +21,7 @@ class MySQLQBTest extends QBTest {
public static function setUpBeforeClass() public static function setUpBeforeClass()
{ {
$params = get_json_config(); $params = get_json_config();
if (($var = getenv('CI'))) // Travis CI Connection Info if (($var = getenv('TRAVIS'))) // Travis CI Connection Info
{ {
$params = array( $params = array(
'host' => '127.0.0.1', 'host' => '127.0.0.1',

2
tests/databases/mysql/MySQLTest.php
View File

@ -24,7 +24,7 @@ class MySQLTest extends DBTest {
public static function setUpBeforeClass() public static function setUpBeforeClass()
{ {
$params = get_json_config(); $params = get_json_config();
if (($var = getenv('CI'))) if (($var = getenv('TRAVIS')))
{ {
self::$db = new \Query\Drivers\Mysql\Driver('host=127.0.0.1;port=3306;dbname=test', 'root'); self::$db = new \Query\Drivers\Mysql\Driver('host=127.0.0.1;port=3306;dbname=test', 'root');
} }

2
tests/databases/pgsql/PgSQLQBTest.php
View File

@ -20,7 +20,7 @@ class PgSQLQBTest extends QBTest {
public static function setUpBeforeClass() public static function setUpBeforeClass()
{ {
$params = get_json_config(); $params = get_json_config();
if (getenv('CI')) // Travis CI Connection Info if (getenv('TRAVIS')) // Travis CI Connection Info
{ {
$params = array( $params = array(
'host' => '127.0.0.1', 'host' => '127.0.0.1',

2
tests/databases/pgsql/PgSQLTest.php
View File

@ -36,7 +36,7 @@ class PgTest extends DBTest {
$class = "Query\\Drivers\\Pgsql\\Driver"; $class = "Query\\Drivers\\Pgsql\\Driver";
$params = get_json_config(); $params = get_json_config();
if (($var = getenv('CI'))) if (($var = getenv('TRAVIS')))
{ {
self::$db = new $class('host=127.0.0.1;port=5432;dbname=test', 'postgres'); self::$db = new $class('host=127.0.0.1;port=5432;dbname=test', 'postgres');
} }