From 8483ae1850a8442d8064c2be872c4f4a8f122f03 Mon Sep 17 00:00:00 2001
From: Jeff Miccolis <jeff@miccolis.net>
Date: Mon, 4 Oct 2010 20:40:46 +0000
Subject: [PATCH] Make sure taxonomy is enabled in the first pass of module
 enabling in the Feeds tests to avoid a trying cache situation.

---
 tests/feeds.test.inc            | 5 +++--
 tests/feeds_processor_term.test | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/tests/feeds.test.inc b/tests/feeds.test.inc
index 65e93d0a..aeda416e 100644
--- a/tests/feeds.test.inc
+++ b/tests/feeds.test.inc
@@ -17,13 +17,14 @@ class FeedsWebTestCase extends DrupalWebTestCase {
    * please don't pass duplicates of what is defined below!
    */
   function setUp($add_modules = array()) {
-    parent::setUp();
+    // We ensure the taxonomy module is enabled first to prevent issues later
+    // on where plugins aren't available.
+    parent::setUp(array('taxonomy'));
     $modules = array(
       'image',
       'file',
       'field',
       'field_ui',
-      'taxonomy',
       'ctools',
       'job_scheduler',
       'feeds',
diff --git a/tests/feeds_processor_term.test b/tests/feeds_processor_term.test
index 066fa661..c248733b 100644
--- a/tests/feeds_processor_term.test
+++ b/tests/feeds_processor_term.test
@@ -26,7 +26,7 @@ class FeedsCSVtoTermsTest extends FeedsWebTestCase {
    * Set up test.
    */
   public function setUp() {
-    parent::setUp(array('taxonomy'));
+    parent::setUp();
 
     $this->drupalLogin($this->drupalCreateUser(array(
       'access content',
-- 
GitLab