Merge pull request #402 from billsacks/do_not_get_cwd_in_arg_default

Do not get cwd in arg defaults
ESMCI · Aug 16, 2016 · f95584b · f95584b
2 parents cdb9fb2 + f210e1c
commit f95584b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/utils/python/CIME/check_lockedfiles.py b/utils/python/CIME/check_lockedfiles.py
@@ -9,10 +9,14 @@
 
 import glob
 
-def check_lockedfiles(caseroot=os.getcwd()):
+def check_lockedfiles(caseroot=None):
     """
     Check that all lockedfiles match what's in case
+
+    If caseroot is not specified, it is set to the current working directory
     """
+    if caseroot is None:
+        caseroot = os.getcwd()
     lockedfiles = glob.glob(os.path.join(caseroot, "LockedFiles", "*.xml"))
     for lfile in lockedfiles:
         fpart = os.path.basename(lfile)

diff --git a/utils/python/CIME/test_status.py b/utils/python/CIME/test_status.py
@@ -62,7 +62,14 @@ def _test_helper2(file_contents, wait_for_run=False, check_throughput=False, che
 
 class TestStatus(object):
 
-    def __init__(self, test_dir=os.getcwd(), test_name=None):
+    def __init__(self, test_dir=None, test_name=None):
+        """
+        Create a TestStatus object
+
+        If test_dir is not specified, it is set to the current working directory
+        """
+        if test_dir is None:
+            test_dir = os.getcwd()
         self._filename = os.path.join(test_dir, TEST_STATUS_FILENAME)
         self._phase_statuses = OrderedDict() # {name -> (status, comments)}
         self._test_name = test_name