Commit 8a7810ca authored by Carsten Richter's avatar Carsten Richter

Merge branch 'update-merge-test' into 'master'

Update merge test

See merge request !70
parents 18ab19eb 4793219c
Pipeline #4600 passed with stages
in 3 minutes and 55 seconds
......@@ -39,10 +39,6 @@ import unittest
from xsocs.test.testfilesmanager import TestFilesManager
from xsocs.process.merge.KmapSpecParser import KmapSpecParser
# ==============================================================
# ==============================================================
# ==============================================================
class TestParser(unittest.TestCase):
"""
......@@ -70,19 +66,11 @@ class TestParser(unittest.TestCase):
@classmethod
def setUpClass(cls):
cls._tmpdir = tempfile.mkdtemp()
cls._manager = TestFilesManager('www.silx.org/pub/'
'xsocs/test_data/spec/')
cls._manager.get_files('img')
cls._manager.get_files('spec')
@classmethod
def tearDownClass(cls):
tmpdir = cls._tmpdir
if tmpdir is not None:
shutil.rmtree(tmpdir)
cls._tmpdir = None
def setUp(self):
self._tmpTestDir = tempfile.mkdtemp()
......@@ -122,21 +110,11 @@ class TestParser(unittest.TestCase):
self.assertEqual(matched_set, self.matched_files)
# ==============================================================
# ==============================================================
# ==============================================================
test_cases = (TestParser,
)
def suite():
loader = unittest.defaultTestLoader
test_suite = unittest.TestSuite()
for test_class in test_cases:
tests = loader.loadTestsFromTestCase(test_class)
test_suite.addTests(tests)
test_suite.addTests(loader.loadTestsFromTestCase(TestParser))
return test_suite
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment