From c3e51195900a0d887ef64b16eed6effaafb0f1b6 Mon Sep 17 00:00:00 2001
From: gamonoid <contact@gamonoid.com>
Date: Tue, 5 Sep 2017 08:25:00 +0200
Subject: [PATCH] Connect to db only after creating tables

---
 test/bootstrap.php     | 4 +---
 test/test.includes.php | 5 -----
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/test/bootstrap.php b/test/bootstrap.php
index 9281b84a..c80344fc 100644
--- a/test/bootstrap.php
+++ b/test/bootstrap.php
@@ -3,8 +3,6 @@ if(file_exists('/usr/lib/php5/mysql.auth.php')){
     include '/usr/lib/php5/mysql.auth.php';
 }
 include(dirname(__FILE__).'/test.config.php');
-include(dirname(__FILE__).'/test.includes.php');
-
 
 $dropDBCommand = 'echo "DROP DATABASE IF EXISTS ' . APP_DB . '"| mysql -u' . MYSQL_ROOT_USER . ' -p' . MYSQL_ROOT_PASS;
 $createDBCommand = 'echo "CREATE DATABASE '.APP_DB.'"| mysql -u'.MYSQL_ROOT_USER.' -p'.MYSQL_ROOT_PASS;
@@ -30,5 +28,5 @@ foreach ($scripts as $insql){
     $command = "cat ".$insql."| mysql -u".MYSQL_ROOT_USER." -p".MYSQL_ROOT_PASS." '".APP_DB."'";
     exec($command);
 }
-
+include(dirname(__FILE__).'/test.includes.php');
 echo "Bootstrapping done!!"."\r\n";
diff --git a/test/test.includes.php b/test/test.includes.php
index b5fb540c..c87392af 100644
--- a/test/test.includes.php
+++ b/test/test.includes.php
@@ -1,9 +1,4 @@
 <?php
-if(!defined('TEST_BASE_PATH')){
-	include(dirname(__FILE__).'/test.config.php');
-}
-
-
 //Mock Session class
 if (!class_exists('SessionUtils')) {
 	class SessionUtils{