fix tests on izumi

git_fleximod/git_fleximod.py

@@ -100,9 +100,9 @@ def submodule_sparse_checkout(root_dir, name, url, path, sparsefile, tag="master
     rgit = GitInterface(root_dir, logger)
     superroot = rgit.git_operation("rev-parse", "--show-superproject-working-tree")
     if superroot:
-        gitroot = superroot
+        gitroot = superroot.strip()
     else:
-        gitroot = root_dir
+        gitroot = root_dir.strip()
     assert os.path.isdir(os.path.join(gitroot, ".git"))
     # first create the module directory
     if not os.path.isdir(os.path.join(root_dir, path)):

git_fleximod/utils.py

@@ -272,7 +272,7 @@ def execute_subprocess(commands, status_to_caller=False, output_to_caller=False)
     cwd = os.getcwd()
     msg = "In directory: {0}\nexecute_subprocess running command:".format(cwd)
     logging.info(msg)
-    commands_str = " ".join(commands)
+    commands_str = " ".join(str(element) for element in commands)
     logging.info(commands_str)
     return_to_caller = status_to_caller or output_to_caller
     status = -1

tests/conftest.py

@@ -25,7 +25,7 @@ def logger():
     path = modules/test
     url = https://github.com/ESMCI/mpi-serial.git
     fxtag = MPIserial_2.4.0
-    fxurl = https://github.com/ESMCI/mpi-serial.git
+    fxDONOTUSEurl = https://github.com/ESMCI/mpi-serial.git
     fxrequired = ToplevelRequired
 """},
     {"subrepo_path": "modules/test_optional",
@@ -39,7 +39,7 @@ def logger():
     path = modules/test_optional
     url = https://github.com/ESMCI/mpi-serial.git
     fxtag = MPIserial_2.4.0
-    fxurl = https://github.com/ESMCI/mpi-serial.git
+    fxDONOTUSEurl = https://github.com/ESMCI/mpi-serial.git
     fxrequired = ToplevelOptional
 """},
     {"subrepo_path": "modules/test_alwaysoptional",
@@ -53,7 +53,7 @@ def logger():
     path = modules/test_alwaysoptional
     url = https://github.com/ESMCI/mpi-serial.git
     fxtag = e5cf35c
-    fxurl = https://github.com/ESMCI/mpi-serial.git
+    fxDONOTUSEurl = https://github.com/ESMCI/mpi-serial.git
     fxrequired = AlwaysOptional
 """},    
     {"subrepo_path": "modules/test_sparse",
@@ -67,7 +67,7 @@ def logger():
     path = modules/test_sparse
     url = https://github.com/ESMCI/mpi-serial.git
     fxtag = MPIserial_2.5.0
-    fxurl = https://github.com/ESMCI/mpi-serial.git
+    fxDONOTUSEurl = https://github.com/ESMCI/mpi-serial.git
     fxrequired = AlwaysRequired
     fxsparse = ../.sparse_file_list
 """},