summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Kraft <george.kraft@calxeda.com>2012-07-18 12:02:42 -0500
committerGeorge Kraft <george.kraft@calxeda.com>2012-07-18 12:02:42 -0500
commitbfe7ff2060227a75a8b1a57c52f8aca9ddb0cb47 (patch)
tree2b1adcdba2a6cd78b3cdcc25c11d4358ee07e71e
parent3d5250a7a50db8bb29ba0f2896710419149b8e38 (diff)
downloadcxmanage-bfe7ff2060227a75a8b1a57c52f8aca9ddb0cb47.tar.gz
cxmanage_test: Use "cxmanage_test-" prefix for temp directories
-rw-r--r--cxmanage_test/image_test.py2
-rw-r--r--cxmanage_test/target_test.py6
-rw-r--r--cxmanage_test/tftp_test.py4
3 files changed, 6 insertions, 6 deletions
diff --git a/cxmanage_test/image_test.py b/cxmanage_test/image_test.py
index ae7a767..60aef9e 100644
--- a/cxmanage_test/image_test.py
+++ b/cxmanage_test/image_test.py
@@ -45,7 +45,7 @@ class ImageTest(unittest.TestCase):
These will rely on an internally hosted TFTP server. """
def setUp(self):
- self.work_dir = tempfile.mkdtemp()
+ self.work_dir = tempfile.mkdtemp(prefix="cxmanage_test-")
# Set up an internal server
self.tftp = InternalTftp()
diff --git a/cxmanage_test/target_test.py b/cxmanage_test/target_test.py
index de66576..454414e 100644
--- a/cxmanage_test/target_test.py
+++ b/cxmanage_test/target_test.py
@@ -50,7 +50,7 @@ class TargetTest(unittest.TestCase):
""" Tests involving cxmanage targets """
def setUp(self):
- self.work_dir = tempfile.mkdtemp()
+ self.work_dir = tempfile.mkdtemp(prefix="cxmanage_test-")
self.targets = [Target(x, verbosity=0, bmc_class=DummyBMC,
ubootenv_class=DummyUbootEnv) for x in ADDRESSES]
@@ -261,7 +261,7 @@ class DummyBMC(LanBMC):
""" Upload an ipinfo file from the node to TFTP"""
self.executed.append("get_fabric_ipinfo")
- work_dir = tempfile.mkdtemp()
+ work_dir = tempfile.mkdtemp(prefix="cxmanage_test-")
# Create IP info file
ipinfo = open("%s/%s" % (work_dir, filename), "w")
@@ -332,7 +332,7 @@ class DummyBMC(LanBMC):
self.partitions[slot_id].retrieves += 1
# Upload blank image to tftp
- work_dir = tempfile.mkdtemp()
+ work_dir = tempfile.mkdtemp(prefix="cxmanage_test-")
open("%s/%s" % (work_dir, filename), "w").write(create_simg(""))
address, port = tftp_address.split(":")
port = int(port)
diff --git a/cxmanage_test/tftp_test.py b/cxmanage_test/tftp_test.py
index 92e3911..2743b47 100644
--- a/cxmanage_test/tftp_test.py
+++ b/cxmanage_test/tftp_test.py
@@ -42,7 +42,7 @@ class InternalTftpTest(unittest.TestCase):
""" Tests involving an internal TFTP server """
def setUp(self):
- self.work_dir = tempfile.mkdtemp()
+ self.work_dir = tempfile.mkdtemp(prefix="cxmanage_test-")
self.tftp = InternalTftp()
def tearDown(self):
@@ -74,7 +74,7 @@ class ExternalTftpTest(unittest.TestCase):
one, but it allows us to make sure the actual TFTP protocol is working. """
def setUp(self):
- self.work_dir = tempfile.mkdtemp()
+ self.work_dir = tempfile.mkdtemp(prefix="cxmanage_test-")
# Set up an internal server
self.internal_tftp = InternalTftp()