Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fix database configuration for travis-ci

  • Loading branch information...
commit c0f3fa1a5e6dd4f33e8006eb8e6e84808fa34b94 1 parent e821fe8
@daris daris authored
View
2  .travis.yml
@@ -19,7 +19,7 @@ before_script:
- "mysql phpbb__test < phpbb3.sql"
- "cd .."
- "cp tests/config.php fluxbb/config.php"
- - "php fluxbb/index.php" # Generate fluxbb cache
+ - "php fluxbb/index.php 2>&1 /dev/null" # Generate fluxbb cache
# - "psql -c 'create database fluxbb__test;' -U postgres"
script: "cd tests && phpunit --bootstrap bootstrap.example.php ConverterTest.php"
View
2  converter.php
@@ -167,4 +167,4 @@
conv_log('Conversion completed in '.$_SESSION['fluxbb_converter']['time'], false, true);
-exit(1);
+exit(0);
View
2  include/functions_cli.php
@@ -52,7 +52,7 @@ function conv_error($message, $file = null, $line = null, $dberror = false)
echo sprintf($lang_convert['Error'], $message).(defined('PUN_DEBUG') && isset($file) ? ' '.sprintf($lang_convert['Error file line'], $file, $line) : '')."\n";
if (defined('PUN_DEBUG') && $dberror !== false)
echo sprintf($lang_convert['Database reported'], $dberror['error_msg'])."\n";
- exit(0);
+ exit(1);
}
View
4 tests/ConverterTest.php
@@ -52,9 +52,9 @@ public function setUp()
// Default database configuration
$old_db_config = array(
'type' => 'mysqli',
- 'host' => 'localhost',
+ 'host' => '0.0.0.0',
'name' => 'phpbb__test',
- 'username' => '',
+ 'username' => 'root',
'password' => '',
'prefix' => 'phpbb_',
'charset' => 'UTF-8',
View
2  tests/config.php
@@ -1,7 +1,7 @@
<?php
$db_type = 'mysqli';
-$db_host = 'localhost';
+$db_host = '0.0.0.0';
$db_name = 'fluxbb__test';
$db_username = 'root';
$db_password = '';
Please sign in to comment.
Something went wrong with that request. Please try again.