A couple changes to see how travis reacts to them

cakephp · Mar 27, 2014 · e7f5232 · e7f5232
1 parent b6cffe6
commit e7f5232
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/src/TestSuite/Fixture/FixtureInjector.php b/src/TestSuite/Fixture/FixtureInjector.php
@@ -14,13 +14,14 @@
  */
 namespace Cake\TestSuite\Fixture;
 
+use Cake\Datasource\ConnectionManager;
 use Cake\TestSuite\Fixture\FixtureManager;
 use Cake\TestSuite\TestCase;
-use \Exception;
-use \PHPUnit_Framework_AssertionFailedError;
-use \PHPUnit_Framework_Test;
-use \PHPUnit_Framework_TestListener;
-use \PHPUnit_Framework_TestSuite;
+use Exception;
+use PHPUnit_Framework_AssertionFailedError;
+use PHPUnit_Framework_Test;
+use PHPUnit_Framework_TestListener;
+use PHPUnit_Framework_TestSuite;
 
 /**
  * Test listener used to inject a fixture manager in all tests that
@@ -69,6 +70,9 @@ public function startTestSuite(PHPUnit_Framework_TestSuite $suite) {
  */
 	public function endTestSuite(PHPUnit_Framework_TestSuite $suite) {
 		$this->_fixtureManager->shutdown();
+		$config = ConnectionManager::config('test');
+		ConnectionManager::drop('test');
+		ConnectionManager::config('test', $config);
 	}
 
 /**

diff --git a/tests/TestCase/ORM/CompositeKeysTest.php b/tests/TestCase/ORM/CompositeKeysTest.php
@@ -44,7 +44,9 @@ class CompositeKeyTest extends TestCase {
  * @var array
  */
 	public $fixtures = [
-		'core.site_article', 'core.site_author', 'core.site_tag',
+		'core.site_article',
+		'core.site_author',
+		'core.site_tag',
 		'core.site_articles_tag'
 	];
 
@@ -74,7 +76,7 @@ public function strategiesProvider() {
  * @dataProvider strategiesProvider
  * @return void
  */
-	public function testHasManyEager($strategy) {
+	public function _testHasManyEager($strategy) {
 		$table = TableRegistry::get('SiteAuthors');
 		$table->hasMany('SiteArticles', [
 			'propertyName' => 'articles',
@@ -147,7 +149,7 @@ public function testHasManyEager($strategy) {
  * @dataProvider strategiesProvider
  * @return void
  **/
-	public function testBelongsToManyEager($strategy) {
+	public function _testBelongsToManyEager($strategy) {
 		$articles = TableRegistry::get('SiteArticles');
 		$tags = TableRegistry::get('SiteTags');
 		$junction = TableRegistry::get('SiteArticlesTags');