openstack/nova
Code Issues Proposed changes

Set logdir to a tempdir in test_network

Browse Source 
Fixes bug #945364

Change-Id: Id7a28bee19f6b78d0608462059c1ed9daf71637c
This commit is contained in:
Hengqing Hu
2012-03-02 21:17:23 +08:00
parent 0193d1253c
commit 50b19a871a
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
nova/tests/test_network.py
View File

@@ -16,7 +16,9 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import mox import mox
import shutil
import sys import sys
import tempfile
from nova import context from nova import context
from nova import db from nova import db
@@ -126,6 +128,8 @@ vifs = [{'id': 0,
class FlatNetworkTestCase(test.TestCase): class FlatNetworkTestCase(test.TestCase):
def setUp(self): def setUp(self):
super(FlatNetworkTestCase, self).setUp() super(FlatNetworkTestCase, self).setUp()
self.tempdir = tempfile.mkdtemp()
self.flags(logdir=self.tempdir)
self.network = network_manager.FlatManager(host=HOST) self.network = network_manager.FlatManager(host=HOST)
temp = utils.import_object('nova.network.minidns.MiniDNS') temp = utils.import_object('nova.network.minidns.MiniDNS')
self.network.instance_dns_manager = temp self.network.instance_dns_manager = temp
@@ -135,7 +139,7 @@ class FlatNetworkTestCase(test.TestCase):
is_admin=False) is_admin=False)
def tearDown(self): def tearDown(self):
self.network.instance_dns_manager.delete_dns_file() shutil.rmtree(self.tempdir)
super(FlatNetworkTestCase, self).tearDown() super(FlatNetworkTestCase, self).tearDown()
def test_get_instance_nw_info(self): def test_get_instance_nw_info(self):
@@ -1268,6 +1272,8 @@ class FloatingIPTestCase(test.TestCase):
"""Tests nova.network.manager.FloatingIP""" """Tests nova.network.manager.FloatingIP"""
def setUp(self): def setUp(self):
super(FloatingIPTestCase, self).setUp() super(FloatingIPTestCase, self).setUp()
self.tempdir = tempfile.mkdtemp()
self.flags(logdir=self.tempdir)
self.network = TestFloatingIPManager() self.network = TestFloatingIPManager()
temp = utils.import_object('nova.network.minidns.MiniDNS') temp = utils.import_object('nova.network.minidns.MiniDNS')
self.network.floating_dns_manager = temp self.network.floating_dns_manager = temp
@@ -1277,7 +1283,7 @@ class FloatingIPTestCase(test.TestCase):
is_admin=False) is_admin=False)
def tearDown(self): def tearDown(self):
self.network.floating_dns_manager.delete_dns_file() shutil.rmtree(self.tempdir)
super(FloatingIPTestCase, self).tearDown() super(FloatingIPTestCase, self).tearDown()
def test_double_deallocation(self): def test_double_deallocation(self):
@@ -1469,6 +1475,8 @@ class InstanceDNSTestCase(test.TestCase):
"""Tests nova.network.manager instance DNS""" """Tests nova.network.manager instance DNS"""
def setUp(self): def setUp(self):
super(InstanceDNSTestCase, self).setUp() super(InstanceDNSTestCase, self).setUp()
self.tempdir = tempfile.mkdtemp()
self.flags(logdir=self.tempdir)
self.network = TestFloatingIPManager() self.network = TestFloatingIPManager()
temp = utils.import_object('nova.network.minidns.MiniDNS') temp = utils.import_object('nova.network.minidns.MiniDNS')
self.network.instance_dns_manager = temp self.network.instance_dns_manager = temp
@@ -1480,7 +1488,7 @@ class InstanceDNSTestCase(test.TestCase):
is_admin=False) is_admin=False)
def tearDown(self): def tearDown(self):
self.network.instance_dns_manager.delete_dns_file() shutil.rmtree(self.tempdir)
super(InstanceDNSTestCase, self).tearDown() super(InstanceDNSTestCase, self).tearDown()
def test_dns_domains_private(self): def test_dns_domains_private(self):