changeset 271:063ba52dc03d

Slave config unit tests were not removing temp files.
author cmlenz
date Fri, 07 Oct 2005 13:00:28 +0000
parents 76bfc58fc394
children 51f60ebf48cc
files bitten/build/tests/config.py
diffstat 1 files changed, 20 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/bitten/build/tests/config.py
+++ b/bitten/build/tests/config.py
@@ -46,7 +46,8 @@
 
     def test_sysinfo_configfile_override(self):
         inifd, ininame = tempfile.mkstemp(prefix='bitten_test')
-        os.write(inifd, """
+        try:
+            os.write(inifd, """
 [machine]
 name = MACHINE
 processor = PROCESSOR
@@ -56,14 +57,16 @@
 family = FAMILY
 version = VERSION
 """)
-        os.close(inifd)
-        config = Configuration(ininame)
+            os.close(inifd)
+            config = Configuration(ininame)
 
-        self.assertEqual('MACHINE', config['machine'])
-        self.assertEqual('PROCESSOR', config['processor'])
-        self.assertEqual('OS', config['os'])
-        self.assertEqual('FAMILY', config['family'])
-        self.assertEqual('VERSION', config['version'])
+            self.assertEqual('MACHINE', config['machine'])
+            self.assertEqual('PROCESSOR', config['processor'])
+            self.assertEqual('OS', config['os'])
+            self.assertEqual('FAMILY', config['family'])
+            self.assertEqual('VERSION', config['version'])
+        finally:
+            os.remove(ininame)
 
     def test_package_properties(self):
         config = Configuration(properties={
@@ -76,17 +79,20 @@
 
     def test_package_configfile(self):
         inifd, ininame = tempfile.mkstemp(prefix='bitten_test')
-        os.write(inifd, """
+        try:
+            os.write(inifd, """
 [python]
 path = /usr/local/bin/python2.3
 version = 2.3.5
 """)
-        os.close(inifd)
-        config = Configuration(ininame)
+            os.close(inifd)
+            config = Configuration(ininame)
 
-        self.assertEqual(True, 'python' in config.packages)
-        self.assertEqual('/usr/local/bin/python2.3', config['python.path'])
-        self.assertEqual('2.3.5', config['python.version'])
+            self.assertEqual(True, 'python' in config.packages)
+            self.assertEqual('/usr/local/bin/python2.3', config['python.path'])
+            self.assertEqual('2.3.5', config['python.version'])
+        finally:
+            os.remove(ininame)
 
     def test_get_dirpath_non_existant(self):
         tempdir = tempfile.mkdtemp()
Copyright (C) 2012-2017 Edgewall Software