From: Assaf Muller <amuller@redhat.com>
Date: Wed, 3 Jun 2015 17:50:57 +0000 (-0400)
Subject: Remove reference to non-existent fullstack fixture
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=b0b9e8bcaf3b2b9f33f8d3cd0bcdc21e8b7a1a87;p=openstack-build%2Fneutron-build.git

Remove reference to non-existent fullstack fixture

EnvironmentFixture doesn't actually exist, and environment
should be a mandatory parameter.

Change-Id: I5598e176f297bcfa3b2cab188b4b446ce18d54ab
---

diff --git a/neutron/tests/fullstack/base.py b/neutron/tests/fullstack/base.py
index 61b50d3a1..9fed9f3e6 100644
--- a/neutron/tests/fullstack/base.py
+++ b/neutron/tests/fullstack/base.py
@@ -17,24 +17,21 @@ from oslo_db.sqlalchemy import test_base
 
 from neutron.db.migration.models import head  # noqa
 from neutron.db import model_base
-from neutron.tests.fullstack import fullstack_fixtures as f_fixtures
 
 
 class BaseFullStackTestCase(test_base.MySQLOpportunisticTestCase):
     """Base test class for full-stack tests."""
 
-    def __init__(self, environment=None, *args, **kwargs):
+    def __init__(self, environment, *args, **kwargs):
         super(BaseFullStackTestCase, self).__init__(*args, **kwargs)
-        self.environment = (environment if environment
-                            else f_fixtures.EnvironmentFixture())
+        self.environment = environment
 
     def setUp(self):
         super(BaseFullStackTestCase, self).setUp()
         self.create_db_tables()
 
-        if self.environment:
-            self.environment.test_name = self.get_name()
-            self.useFixture(self.environment)
+        self.environment.test_name = self.get_name()
+        self.useFixture(self.environment)
 
         self.client = self.environment.neutron_server.client