Updated to dovecottesting 1.2

This lets us simplify our test script by not having to care about
different ip addresses.
This commit is contained in:
Robert Hafner 2014-02-27 00:12:28 -08:00
parent ef5f76d352
commit 56dc838df9
2 changed files with 3 additions and 3 deletions

View File

@ -15,7 +15,7 @@
"php": ">=5.3.0" "php": ">=5.3.0"
}, },
"require-dev": { "require-dev": {
"tedivm/dovecottesting": "~1" "tedivm/dovecottesting": "~1.2"
}, },
"autoload": { "autoload": {
"psr-0": {"Fetch": "src/"} "psr-0": {"Fetch": "src/"}

View File

@ -14,15 +14,15 @@ error_reporting(-1);
define('TESTING', true); define('TESTING', true);
define('TEST_USER', 'testuser'); define('TEST_USER', 'testuser');
define('TEST_PASSWORD', 'applesauce'); define('TEST_PASSWORD', 'applesauce');
define('TESTING_SERVER_HOST', '172.31.1.2');
date_default_timezone_set('UTC'); date_default_timezone_set('UTC');
if(getenv('TRAVIS')) if(getenv('TRAVIS'))
{ {
define('TESTING_ENVIRONMENT', 'TRAVIS'); define('TESTING_ENVIRONMENT', 'TRAVIS');
define('TESTING_SERVER_HOST', '127.0.0.1');
}else{ }else{
define('TESTING_ENVIRONMENT', 'VAGRANT'); define('TESTING_ENVIRONMENT', 'VAGRANT');
define('TESTING_SERVER_HOST', '172.31.1.2');
echo 'Initializing Environment using Vagrant' . PHP_EOL; echo 'Initializing Environment using Vagrant' . PHP_EOL;
passthru('/bin/bash ' . __DIR__ . '/../vendor/tedivm/dovecottesting/SetupEnvironment.sh'); passthru('/bin/bash ' . __DIR__ . '/../vendor/tedivm/dovecottesting/SetupEnvironment.sh');
echo 'Environment Initialized' . PHP_EOL . PHP_EOL . PHP_EOL; echo 'Environment Initialized' . PHP_EOL . PHP_EOL . PHP_EOL;