improve naming and use returned path

Author: albu-diku

tests/support/__init__.py

@@ -41,7 +41,7 @@
 from unittest import TestCase, main as testmain
 
 from tests.support.configsupp import FakeConfiguration
-from tests.support.picklesupp import ensure_path_within_output_dir, \
+from tests.support.picklesupp import verify_path_within_output_dir_and_return, \
     is_path_within
 from tests.support.suppconst import MIG_BASE, TEST_BASE, TEST_FIXTURE_DIR, \
     TEST_DATA_DIR, TEST_OUTPUT_DIR, ENVHELP_OUTPUT_DIR
@@ -391,7 +391,7 @@ def temppath(relative_path, test_case, ensure_dir=False, skip_clean=False):
     """
     assert isinstance(test_case, MigTestCase)
 
-    tmp_path = ensure_path_within_output_dir(relative_path)
+    tmp_path = verify_path_within_output_dir_and_return(relative_path)
 
     if ensure_dir:
         try:

tests/support/_path.py

@@ -13,7 +13,7 @@ def is_path_within(path, start=None, _msg=None):
     return not relative.startswith('..')
 
 
-def ensure_path_within_output_dir(relative_path):
+def verify_path_within_output_dir_and_return(relative_path):
     if os.path.isabs(relative_path):
         # the only permitted paths are those within the output directory set
         # aside for execution of the test suite: this will be enforced below

tests/support/picklesupp.py

@@ -1,12 +1,12 @@
 import pickle
 
-from tests.support._path import ensure_path_within_output_dir, \
+from tests.support._path import verify_path_within_output_dir_and_return, \
     is_path_within
 
 
 class PickleAssertMixin:
     def assertPickledFile(self, pickle_file):
-        ensure_path_within_output_dir(pickle_file)
+        tmp_path = verify_path_within_output_dir_and_return(pickle_file)
 
-        with open(pickle_file, 'rb') as picklefile:
+        with open(tmp_path, 'rb') as picklefile:
             return pickle.load(picklefile)