[test] Use central test dir and cleanup

All tests writing to file now use the central test directory
from test/util and clean up after they are done.

Author: mpsonntag

test/test_doc_integration.py

@@ -5,17 +5,17 @@
 
 import os
 import shutil
-import tempfile
 import unittest
 
 import odml
+from .util import create_test_dir
 
 
 class TestDocumentIntegration(unittest.TestCase):
 
     def setUp(self):
         # Set up test environment
-        self.tmp_dir = tempfile.mkdtemp(suffix=".odml")
+        self.tmp_dir = create_test_dir(__file__)
 
         self.json_file = os.path.join(self.tmp_dir, "test.json")
         self.xml_file = os.path.join(self.tmp_dir, "test.xml")

test/test_dtypes_integration.py

@@ -7,17 +7,17 @@
 import datetime as dt
 import os
 import shutil
-import tempfile
 import unittest
 
 import odml
+from .util import create_test_dir
 
 
 class TestTypesIntegration(unittest.TestCase):
 
     def setUp(self):
         # Set up test environment
-        self.tmp_dir = tempfile.mkdtemp(suffix=".odml")
+        self.tmp_dir = create_test_dir(__file__)
 
         self.json_file = os.path.join(self.tmp_dir, "test.json")
         self.xml_file = os.path.join(self.tmp_dir, "test.xml")

test/test_format_converter.py

@@ -1,9 +1,12 @@
 import os
+import shutil
 import tempfile
 import unittest
+
 from contextlib import contextmanager
 
 from odml.tools.converters import FormatConverter
+from .util import create_test_dir
 
 FC = FormatConverter
 
@@ -20,6 +23,11 @@ def setUp(self):
                         </section>
                       </odML>
                    """
+        self.tmp_dir = None
+
+    def tearDown(self):
+        if os.path.exists(self.tmp_dir):
+            shutil.rmtree(self.tmp_dir)
 
     @contextmanager
     def assertNotRaises(self, exc_type):
@@ -28,6 +36,13 @@ def assertNotRaises(self, exc_type):
         except exc_type:
             raise self.failureException('{} raised'.format(exc_type.__name__))
 
+    def _create_open_file(self, in_dir):
+        in_file = tempfile.NamedTemporaryFile(mode='a+', suffix=".xml", dir=in_dir)
+        in_file.write(self.doc)
+        in_file.seek(0)
+
+        return in_file
+
     def test_convert(self):
         if os.name == 'nt':
             raise unittest.SkipTest("Skipping test on Windows")
@@ -50,10 +65,10 @@ def test_convert_dir_no_output_dir(self, recursive=False, func=None):
         if os.name == 'nt':
             raise unittest.SkipTest("Skipping test on Windows")
 
-        work_dir = tempfile.mkdtemp()
-        in_dir = tempfile.mkdtemp(dir=work_dir)
-        in_file = self.create_open_file(in_dir)
-        in_file2 = self.create_open_file(in_dir)
+        self.tmp_dir = create_test_dir(__file__)
+        in_dir = tempfile.mkdtemp(dir=self.tmp_dir)
+        in_file = self._create_open_file(in_dir)
+        in_file2 = self._create_open_file(in_dir)
 
         if not func:
             FC.convert_dir(in_dir, None, recursive, "odml")
@@ -64,7 +79,7 @@ def test_convert_dir_no_output_dir(self, recursive=False, func=None):
                 func([in_dir, "odml"])
 
         files = []
-        for dir_path, dir_names, file_names in os.walk(work_dir):
+        for dir_path, dir_names, file_names in os.walk(self.tmp_dir):
             for file_name in file_names:
                 files.append(os.path.join(dir_path, file_name))
 
@@ -89,10 +104,11 @@ def test_convert_dir_with_output_dir_specified(self, func=None):
             raise unittest.SkipTest("Skipping test on Windows")
 
         # Testing FC.convert_dir(in_dir, out_dir, False, "odml")
-        in_dir = tempfile.mkdtemp()
-        out_dir = tempfile.mkdtemp()
-        in_file = self.create_open_file(in_dir)
-        in_file2 = self.create_open_file(in_dir)
+        self.tmp_dir = create_test_dir(__file__)
+        in_dir = tempfile.mkdtemp(dir=self.tmp_dir)
+        out_dir = tempfile.mkdtemp(dir=self.tmp_dir)
+        in_file = self._create_open_file(in_dir)
+        in_file2 = self._create_open_file(in_dir)
 
         if not func:
             FC.convert_dir(in_dir, out_dir, False, "odml")
@@ -124,15 +140,10 @@ def test_convert_dir_with_output_dir_specified(self, func=None):
         in_file.close()
         in_file2.close()
 
-    def create_open_file(self, in_dir):
-        in_file = tempfile.NamedTemporaryFile(mode='a+', suffix=".xml", dir=in_dir)
-        in_file.write(self.doc)
-        in_file.seek(0)
-        return in_file
-
     def test_check_io_directory(self):
-        out_dir = tempfile.mkdtemp()
-        in_dir = tempfile.mkdtemp()
+        self.tmp_dir = create_test_dir(__file__)
+        out_dir = tempfile.mkdtemp(dir=self.tmp_dir)
+        in_dir = tempfile.mkdtemp(dir=self.tmp_dir)
         with self.assertRaises(ValueError):
             FC._check_input_output_directory(None, None)
         with self.assertRaises(ValueError):

test/test_links.py

@@ -1,4 +1,5 @@
 import unittest
+
 from . import test_samplefile as samplefile
 
 

test/test_parser_json.py

@@ -5,11 +5,12 @@
 
 import json
 import os
-import tempfile
+import shutil
 import unittest
 
 from odml.tools import dict_parser
 from odml.tools.parser_utils import ParserException, InvalidVersionException
+from .util import create_test_dir
 
 
 _INVALID_ATTRIBUTE_HANDLING_DOC = """
@@ -114,16 +115,11 @@ def setUp(self):
 
         self.json_reader = dict_parser.DictReader(show_warnings=False)
 
-        dir_name = os.path.basename(os.path.splitext(__file__)[0])
-        tmp_base_path = os.path.join(tempfile.gettempdir(), "odml_test")
-        if not os.path.exists(tmp_base_path):
-            os.mkdir(tmp_base_path)
+        self.tmp_dir_path = create_test_dir(__file__)
 
-        tmp_dir_path = os.path.join(tmp_base_path, dir_name)
-        if not os.path.exists(tmp_dir_path):
-            os.mkdir(tmp_dir_path)
-
-        self.tmp_dir_path = tmp_dir_path
+    def tearDown(self):
+        if os.path.exists(self.tmp_dir_path):
+            shutil.rmtree(self.tmp_dir_path)
 
     def _prepare_doc(self, file_name, file_content):
         file_path = os.path.join(self.tmp_dir_path, file_name)

test/test_parser_odml.py

@@ -5,11 +5,11 @@
 
 import os
 import shutil
-import tempfile
 import unittest
 
 from odml import Document, Section, Property
 from odml.tools import odmlparser
+from .util import create_test_dir
 
 
 class TestOdmlParser(unittest.TestCase):
@@ -19,7 +19,7 @@ def setUp(self):
         dir_path = os.path.dirname(os.path.realpath(__file__))
         self.basefile = os.path.join(dir_path, "resources", "example.odml")
 
-        self.tmp_dir = tempfile.mkdtemp(suffix=".odml")
+        self.tmp_dir = create_test_dir(__file__)
 
         self.json_file = os.path.join(self.tmp_dir, "test.json")
         self.xml_file = os.path.join(self.tmp_dir, "test.xml")

test/test_parser_yaml.py

@@ -4,12 +4,13 @@
 """
 
 import os
-import tempfile
+import shutil
 import unittest
 import yaml
 
 from odml.tools import dict_parser
 from odml.tools.parser_utils import ParserException, InvalidVersionException
+from .util import create_test_dir
 
 
 _INVALID_ATTRIBUTE_HANDLING_DOC = """
@@ -74,16 +75,11 @@ def setUp(self):
 
         self.yaml_reader = dict_parser.DictReader(show_warnings=False)
 
-        dir_name = os.path.basename(os.path.splitext(__file__)[0])
-        tmp_base_path = os.path.join(tempfile.gettempdir(), "odml_test")
-        if not os.path.exists(tmp_base_path):
-            os.mkdir(tmp_base_path)
+        self.tmp_dir_path = create_test_dir(__file__)
 
-        tmp_dir_path = os.path.join(tmp_base_path, dir_name)
-        if not os.path.exists(tmp_dir_path):
-            os.mkdir(tmp_dir_path)
-
-        self.tmp_dir_path = tmp_dir_path
+    def tearDown(self):
+        if os.path.exists(self.tmp_dir_path):
+            shutil.rmtree(self.tmp_dir_path)
 
     def _prepare_doc(self, file_name, file_content):
         file_path = os.path.join(self.tmp_dir_path, file_name)

test/test_property_integration.py

@@ -5,17 +5,18 @@
 
 import os
 import shutil
-import tempfile
 import unittest
 
 import odml
 
+from .util import create_test_dir
+
 
 class TestPropertyIntegration(unittest.TestCase):
 
     def setUp(self):
         # Set up test environment
-        self.tmp_dir = tempfile.mkdtemp(suffix=".odml")
+        self.tmp_dir = create_test_dir(__file__)
 
         self.json_file = os.path.join(self.tmp_dir, "test.json")
         self.xml_file = os.path.join(self.tmp_dir, "test.xml")

test/test_samplefile.py

@@ -1,7 +1,6 @@
 import os
 import re
 import sys
-import tempfile
 import unittest
 
 try:
@@ -13,6 +12,7 @@
 
 from odml.info import FORMAT_VERSION
 from odml.tools import xmlparser
+from .util import create_test_dir
 
 try:
     unicode = unicode
@@ -162,7 +162,7 @@ def test_xml_writer_version(self):
         # self.assertEqual(doc._xml_version, FORMAT_VERSION)
 
     def test_save(self):
-        base_path = tempfile.gettempdir()
+        base_path = create_test_dir(__file__)
         for module in [xmlparser.XMLWriter]:
             path = os.path.join(base_path, "temp.odml")
             doc = module(self.doc)
@@ -369,7 +369,8 @@ def test_get_property_by_path(self):
         self.assertRaises(ValueError, sec1.get_property_by_path, wrong_path)
 
     def test_save_version(self):
-        tmp_file = os.path.join(tempfile.gettempdir(), "example.odml")
+        tmp_dir = create_test_dir(__file__)
+        tmp_file = os.path.join(tmp_dir, "example.odml")
 
         self.doc.version = '2.4'
         writer = xmlparser.XMLWriter(self.doc)

test/test_section_integration.py

@@ -5,17 +5,18 @@
 
 import os
 import shutil
-import tempfile
 import unittest
 
 import odml
 
+from .util import create_test_dir
+
 
 class TestSectionIntegration(unittest.TestCase):
 
     def setUp(self):
         # Set up test environment
-        self.tmp_dir = tempfile.mkdtemp(suffix=".odml")
+        self.tmp_dir = create_test_dir(__file__)
 
         self.json_file = os.path.join(self.tmp_dir, "test.json")
         self.xml_file = os.path.join(self.tmp_dir, "test.xml")