diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-03-08 17:20:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-03-08 17:20:47 +0000 |
| commit | 8febfb5ad19a83e9b11438d09374b34e2b41e2df (patch) | |
| tree | 8b7a51af1a9c7bd17ebc17b5a5bf5ceed23176b7 | |
| parent | 293275338134ea8311716a2fcc1dbd9cc38b84f8 (diff) | |
| parent | 50b19a871a32be1452080c70c237bc8d7a1f1eb1 (diff) | |
| download | nova-8febfb5ad19a83e9b11438d09374b34e2b41e2df.tar.gz nova-8febfb5ad19a83e9b11438d09374b34e2b41e2df.tar.xz nova-8febfb5ad19a83e9b11438d09374b34e2b41e2df.zip | |
Merge "Set logdir to a tempdir in test_network"
| -rw-r--r-- | nova/tests/test_network.py | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/nova/tests/test_network.py b/nova/tests/test_network.py index 7e7ae6b4b..2e50587f9 100644 --- a/nova/tests/test_network.py +++ b/nova/tests/test_network.py @@ -16,7 +16,9 @@ # License for the specific language governing permissions and limitations # under the License. import mox +import shutil import sys +import tempfile from nova import context from nova import db @@ -126,6 +128,8 @@ vifs = [{'id': 0, class FlatNetworkTestCase(test.TestCase): def setUp(self): super(FlatNetworkTestCase, self).setUp() + self.tempdir = tempfile.mkdtemp() + self.flags(logdir=self.tempdir) self.network = network_manager.FlatManager(host=HOST) temp = utils.import_object('nova.network.minidns.MiniDNS') self.network.instance_dns_manager = temp @@ -135,7 +139,7 @@ class FlatNetworkTestCase(test.TestCase): is_admin=False) def tearDown(self): - self.network.instance_dns_manager.delete_dns_file() + shutil.rmtree(self.tempdir) super(FlatNetworkTestCase, self).tearDown() def test_get_instance_nw_info(self): @@ -1268,6 +1272,8 @@ class FloatingIPTestCase(test.TestCase): """Tests nova.network.manager.FloatingIP""" def setUp(self): super(FloatingIPTestCase, self).setUp() + self.tempdir = tempfile.mkdtemp() + self.flags(logdir=self.tempdir) self.network = TestFloatingIPManager() temp = utils.import_object('nova.network.minidns.MiniDNS') self.network.floating_dns_manager = temp @@ -1277,7 +1283,7 @@ class FloatingIPTestCase(test.TestCase): is_admin=False) def tearDown(self): - self.network.floating_dns_manager.delete_dns_file() + shutil.rmtree(self.tempdir) super(FloatingIPTestCase, self).tearDown() def test_double_deallocation(self): @@ -1469,6 +1475,8 @@ class InstanceDNSTestCase(test.TestCase): """Tests nova.network.manager instance DNS""" def setUp(self): super(InstanceDNSTestCase, self).setUp() + self.tempdir = tempfile.mkdtemp() + self.flags(logdir=self.tempdir) self.network = TestFloatingIPManager() temp = utils.import_object('nova.network.minidns.MiniDNS') self.network.instance_dns_manager = temp @@ -1480,7 +1488,7 @@ class InstanceDNSTestCase(test.TestCase): is_admin=False) def tearDown(self): - self.network.instance_dns_manager.delete_dns_file() + shutil.rmtree(self.tempdir) super(InstanceDNSTestCase, self).tearDown() def test_dns_domains_private(self): |