acceptance_test: clarify/document tests

Ref: e2e6e31#r30863971

Author: blueyed

testing/acceptance_test.py

@@ -570,14 +570,14 @@ def test_cmdline_python_package(self, testdir, monkeypatch):
         assert result.ret == 0
         result.stdout.fnmatch_lines(["*1 passed*"])
 
-        def join_pythonpath(what):
+        def prepend_pythonpath(what):
             cur = os.environ.get("PYTHONPATH")
             if cur:
                 return str(what) + os.pathsep + cur
-            return what
+            return str(what)
 
         empty_package = testdir.mkpydir("empty_package")
-        monkeypatch.setenv("PYTHONPATH", str(join_pythonpath(empty_package)))
+        monkeypatch.setenv("PYTHONPATH", prepend_pythonpath(empty_package))
         # the path which is not a package raises a warning on pypy;
         # no idea why only pypy and not normal python warn about it here
         with warnings.catch_warnings():
@@ -586,7 +586,7 @@ def join_pythonpath(what):
         assert result.ret == 0
         result.stdout.fnmatch_lines(["*2 passed*"])
 
-        monkeypatch.setenv("PYTHONPATH", str(join_pythonpath(testdir)))
+        monkeypatch.setenv("PYTHONPATH", prepend_pythonpath(testdir))
         result = testdir.runpytest("--pyargs", "tpkg.test_missing", syspathinsert=True)
         assert result.ret != 0
         result.stderr.fnmatch_lines(["*not*found*test_missing*"])
@@ -626,13 +626,14 @@ def test_cmdline_python_namespace_package(self, testdir, monkeypatch):
         #             ├── __init__.py
         #             └── test_world.py
 
-        def join_pythonpath(*dirs):
+        def append_pythonpath(*dirs):
             cur = os.environ.get("PYTHONPATH")
             if cur:
                 dirs += (cur,)
             return os.pathsep.join(str(p) for p in dirs)
 
-        monkeypatch.setenv("PYTHONPATH", join_pythonpath(*search_path))
+        # NOTE: the different/reversed ordering is intentional here.
+        monkeypatch.setenv("PYTHONPATH", append_pythonpath(*search_path))
         for p in search_path:
             monkeypatch.syspath_prepend(p)
 
@@ -688,8 +689,6 @@ def test_cmdline_python_package_symlink(self, testdir, monkeypatch):
                 pytest.skip(six.text_type(e.args[0]))
         monkeypatch.delenv("PYTHONDONTWRITEBYTECODE", raising=False)
 
-        search_path = ["lib", os.path.join("local", "lib")]
-
         dirname = "lib"
         d = testdir.mkdir(dirname)
         foo = d.mkdir("foo")
@@ -722,13 +721,15 @@ def test_cmdline_python_package_symlink(self, testdir, monkeypatch):
         #             ├── conftest.py
         #             └── test_bar.py
 
-        def join_pythonpath(*dirs):
+        def append_pythonpath(*dirs):
             cur = os.getenv("PYTHONPATH")
             if cur:
                 dirs += (cur,)
             return os.pathsep.join(str(p) for p in dirs)
 
-        monkeypatch.setenv("PYTHONPATH", join_pythonpath(*search_path))
+        # NOTE: the different/reversed might not be intentional here (copied).
+        search_path = ["lib", os.path.join("local", "lib")]
+        monkeypatch.setenv("PYTHONPATH", append_pythonpath(*search_path))
         for p in search_path:
             monkeypatch.syspath_prepend(p)