changeset 296:1d01273abcb0

* Applied patch by Sven Reimers to fix the `<java:ant>` task on Windows. Closes #69. * The tests for `bitten.slave` left temporary files around. No longer.
author cmlenz
date Wed, 26 Oct 2005 22:05:57 +0000
parents 5f84af72d17f
children a40325666b5a
files bitten/build/javatools.py bitten/tests/slave.py
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/bitten/build/javatools.py
+++ b/bitten/build/javatools.py
@@ -27,6 +27,7 @@
         executable = os.path.join(ant_home, 'bin', 'ant')
 
     logfile = tempfile.NamedTemporaryFile(prefix='ant_log', suffix='.xml')
+    logfile.close()
     if args:
         args = shlex.split(args)
     else:
@@ -51,7 +52,7 @@
     error_logged = False
     log_elem = xmlio.Fragment()
     try:
-        xml_log = xmlio.parse(logfile)
+        xml_log = xmlio.parse(file(logfile.name, 'r'))
         def collect_log_messages(node):
             for child in node.children():
                 if child.name == 'message':
--- a/bitten/tests/slave.py
+++ b/bitten/tests/slave.py
@@ -22,7 +22,7 @@
 
     def setUp(self):
         self.work_dir = tempfile.mkdtemp(prefix='bitten_test')
-        self.slave = Slave(None, None)
+        self.slave = Slave(None, None, work_dir=self.work_dir)
         self.handler = OrchestrationProfileHandler(Mock(session=self.slave))
 
     def tearDown(self):
Copyright (C) 2012-2017 Edgewall Software