[Libreoffice-commits] core.git: solenv/qa

Bjoern Michaelsen bjoern.michaelsen at canonical.com
Fri Nov 25 02:05:59 UTC 2016


 solenv/qa/python/gbuildtojson.py |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit e62fc464f21fdaace28709f316becfa0fc54c0e8
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Wed Nov 23 01:33:54 2016 +0100

    use gbuild prefix for tempdirs
    
    Change-Id: Icc262c51fd70ae35b44722be8d4ab767b69ae2a8
    Reviewed-on: https://gerrit.libreoffice.org/31094
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>

diff --git a/solenv/qa/python/gbuildtojson.py b/solenv/qa/python/gbuildtojson.py
index 67782d5..e09139b 100644
--- a/solenv/qa/python/gbuildtojson.py
+++ b/solenv/qa/python/gbuildtojson.py
@@ -39,7 +39,7 @@ class CheckGbuildToJson(unittest.TestCase):
     def setUp(self):
         getgbuildtesttools(self)
         clearmakevars()
-        self.tempwork = tempfile.mkdtemp()
+        self.tempwork = tempfile.mkdtemp(prefix='gbuild')
 
     def tearDown(self):
         shutil.rmtree(self.tempwork)
@@ -47,7 +47,7 @@ class CheckGbuildToJson(unittest.TestCase):
     def test_gbuildtojson(self):
         os.makedirs(os.path.join(self.tempwork, 'LinkTarget', 'Executable'))
         shutil.copy(self.gbuildtojson, os.path.join(self.tempwork, 'LinkTarget', 'Executable'))
-        (bashscripthandle, bashscriptname) = tempfile.mkstemp()
+        (bashscripthandle, bashscriptname) = tempfile.mkstemp('gbuild')
         bashscript = os.fdopen(bashscripthandle, 'w', newline='\n')
         bashscript.write("set -e\n")
         bashscript.write("cd %s/solenv/qa/python/selftest\n" % os.environ['SRCDIR'])
@@ -95,8 +95,8 @@ class CheckGbuildToJsonModules(unittest.TestCase):
     def setUp(self):
         getgbuildtesttools(self)
         clearmakevars()
-        self.tempwork = tempfile.mkdtemp()
-        self.tempsrc = tempfile.mkdtemp()
+        self.tempwork = tempfile.mkdtemp(prefix='gbuild')
+        self.tempsrc = tempfile.mkdtemp(prefix='gbuild')
         self.srcdir = os.environ['SRCDIR']
         if os.environ['OS'] == 'WNT':
             self.tempworkmixed = self.tempwork.replace('\\','/')
@@ -130,7 +130,7 @@ class CheckGbuildToJsonModules(unittest.TestCase):
             shutil.copy(self.gbuildtojson, os.path.join(self.tempwork, 'LinkTarget', 'Executable'))
             if module != 'solenv':
                 shutil.copytree(os.path.join(os.environ['SRCDIR'], module), os.path.join(self.tempsrc, module))
-            (bashscripthandle, bashscriptname) = tempfile.mkstemp()
+            (bashscripthandle, bashscriptname) = tempfile.mkstemp(prefix='gbuild')
             bashscript = os.fdopen(bashscripthandle, 'w', newline='\n')
             bashscript.write("set -e\n")
             bashscript.write("cd %s/%s\n" % (self.tempsrc.replace('\\','/'), module))


More information about the Libreoffice-commits mailing list