Changeset 76c37a9 in flex_extract.git for Source/Pythontest/TestInstall.py

Timestamp:

Dec 19, 2019, 8:11:12 PM (4 years ago)

Author:

Anne Philipp <anne.philipp@…>

Branches:

master, ctbto, dev

Children:

d720895

Parents:

d2b7217

Message:

updated unit tests to work with updated code

File:

• Source/Pythontest/TestInstall.py (modified) (6 diffs)

Source/Pythontest/TestInstall.py

@@ -1 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
@@ -11 +11 @@
 import shutil
 from genshi.template import TemplateLoader
-from genshi.template.eval import  UndefinedError
-from exceptions import OSError
+from genshi.template.eval import UndefinedError
+
+try:
+    import exceptions
+except ImportError:
+    import builtins
 import pytest
 from mock import patch
 
-sys.path.append('../python')
+sys.path.append('../Python')
 import _config
-import _config_test
+from . import _config_test
 from install import (mk_tarball, un_tarball, mk_env_vars, mk_compilejob,
                      mk_job_template)
 
-from mods.tools import make_dir, silent_remove
+from Mods.tools import make_dir, silent_remove
 
 #    - main
@@ -44 +48 @@
 
         # un tar the test tarballs from shell script
-        subprocess.check_output([os.path.join(self.testinstalldir,
-                                              'un_install_tar.sh')])
+#        subprocess.check_output([os.path.join(self.testinstalldir,
+#                                            'un_install_tar.sh')])
 
 
@@ -56 +60 @@
         tarballname = _config.FLEXEXTRACT_DIRNAME + '_localtest.tar'
 
-        with pytest.raises(SystemExit):
-            mk_tarball(ecd + tarballname, 'local')
         with pytest.raises(SystemExit):
             mk_tarball(ecd + tarballname, 'local')
@@ -78 +80 @@
 
         # remove test tar file from flex_extract directory
-        os.remove(ecd + tarballname)
+        #os.remove(ecd + tarballname)
 
         # test if comparison filelist is equal to the
@@ -310 +312 @@
         test_dir = os.path.join(self.testinstalldir,
                                 _config.FLEXEXTRACT_DIRNAME + '_local')
-        shutil.rmtree(test_dir)
+#        shutil.rmtree(test_dir)
         test_dir = os.path.join(self.testinstalldir,
                                 _config.FLEXEXTRACT_DIRNAME + '_ecgate')
-        shutil.rmtree(test_dir)
+#        shutil.rmtree(test_dir)
 
         test_dir = os.path.join(self.testinstalldir,
                                 'test_local')
-        shutil.rmtree(test_dir)
+#        shutil.rmtree(test_dir)
         test_dir = os.path.join(self.testinstalldir,
                                 'test_ecgate')
-        shutil.rmtree(test_dir)
+#        shutil.rmtree(test_dir)
 
         tar_file = os.path.join(self.testinstalldir,
                      _config.FLEXEXTRACT_DIRNAME + '_local.tar')
-        os.remove(tar_file)
+#        os.remove(tar_file)
         tar_file = os.path.join(self.testinstalldir,
                                 _config.FLEXEXTRACT_DIRNAME + '_ecgate.tar')
-        os.remove(tar_file)
+#        os.remove(tar_file)
         pass