various python: clean up sys.path hacks

The reason that the files in test/verify/ don't need to do sys.path
hacks is because parent.py has been symlinked into that directory.  Do
the same with the two other directories which contain scripts which need
such hacks, allowing a substantial cleanup.

Make some minor code adjustments to use the variables defined in
parent.py instead of the home-brew versions.

Add a somewhat dubious cwd= parameter to the `git grep` subprocess
invocation in tools/url-check.  This is strictly correct (since we want
to check the base directory, regardless of the current directory when
the tool was invoked) but we're really doing as a convenient way to
avoid a message about an unused import.

Author: allisonkarlitskaya

test/containers/check-bastion

@@ -19,18 +19,11 @@
 
 
 import os
-import sys
-
-test_dir = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
-sys.path.append(test_dir)
-
-from verify import parent
-parent  # pyflakes
-
+from parent import TEST_DIR
 from testlib import *
 from testvm import VirtMachine
 
-AUTH_KEY = os.path.join(test_dir, "containers/files/enc_rsa")
+AUTH_KEY = os.path.join(TEST_DIR, "containers/files/enc_rsa")
 PUB_AUTH_KEY = "{}.pub".format(AUTH_KEY)
 
 

test/containers/parent.py

@@ -0,0 +1 @@
+../common/parent.py

test/containers/run-tests

@@ -22,17 +22,11 @@ import imp
 import os
 import string
 import unittest
+from parent import TEST_DIR, BASE_DIR
+import testlib
 
-sys.dont_write_bytecode = True
-
-base_dir = os.path.dirname(os.path.realpath(__file__))
-testdir = os.path.dirname(base_dir)
-sys.path.append(testdir)
 
-from verify import parent
-parent  # pyflakes
-
-from common import testlib
+sys.dont_write_bytecode = True
 
 
 def check_valid(filename):
@@ -47,7 +41,7 @@ def run(opts):
     # Now actually load the tests, any modules that start with "check-*"
     loader = unittest.TestLoader()
     suite = unittest.TestSuite()
-    for filename in glob.glob(os.path.join(base_dir,
+    for filename in glob.glob(os.path.join(TEST_DIR, "containers",
                                            "check-{0}*".format(opts.container))):
         name = check_valid(filename)
         if not name or not os.path.isfile(filename):
@@ -68,7 +62,7 @@ def main():
     if not opts.container:
         opts.container = 'bastion'
 
-    if not os.path.isdir(os.path.abspath(os.path.join(testdir, "..", "containers", opts.container))):
+    if not os.path.isdir(os.path.abspath(os.path.join(BASE_DIR, "containers", opts.container))):
         sys.stderr.write("Unable to run tests for unknown container {0}.\n".format(opts.container))
         exit(1)
 

tools/parent.py

@@ -0,0 +1 @@
+../test/common/parent.py

tools/urls-check

@@ -18,16 +18,13 @@
 # along with Cockpit; If not, see <http://www.gnu.org/licenses/>.
 
 
-import os
-from os.path import dirname, abspath
 import sys
 import time
 import argparse
 import subprocess
 import urllib
 from urllib.request import urlopen, Request
-
-sys.path.append(os.path.join(dirname(dirname(abspath(__file__))), "bots"))
+from parent import BASE_DIR
 import task
 
 DAYS = 7
@@ -87,7 +84,7 @@ def main():
 
 def check_urls(verbose):
     command = r'git grep -IEho "(https?)://[-a-zA-Z0-9@:%_\+.~#?&=/]+" -- pkg ":!*.svg" | sort -u'
-    urls = subprocess.check_output(command, shell=True, universal_newlines=True).split("\n")
+    urls = subprocess.check_output(command, shell=True, universal_newlines=True, cwd=BASE_DIR).split("\n")
     redirects = []
     failed = []
     for url in urls: