mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-27 18:50:48 +00:00
Code Issues 1 Projects Releases Wiki Activity

validate:launcher: Add a GST_VALIDATE_LAUNCHER_MAIN_DIR env variable

Browse source 
This is generally usefull so we do not have to pass -M every time we launch the launcher

And it adds support for nesting launcher calls always respecting the provided main directory

+ Fix some new pep8 errors
This commit is contained in:
Thibault Saunier 2018-11-30 10:59:51 -03:00
parent ec9464dd90
commit 1c51d3499e
2 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
validate/launcher/main.py
View file

@ -140,7 +140,8 @@ http://wiki.pitivi.org/wiki/Bug_reporting#Debug_logs).
QA_ASSETS = "gst-integration-testsuites" QA_ASSETS = "gst-integration-testsuites"
MEDIAS_FOLDER = "medias" MEDIAS_FOLDER = "medias"
DEFAULT_GST_QA_ASSETS_REPO = "https://gitlab.freedesktop.org/gstreamer/gst-integration-testsuites.git" DEFAULT_GST_QA_ASSETS_REPO = "https://gitlab.freedesktop.org/gstreamer/gst-integration-testsuites.git"
DEFAULT_TESTSUITES_DIRS = [os.path.join(DEFAULT_MAIN_DIR, QA_ASSETS, "testsuites")] DEFAULT_TESTSUITES_DIRS = [os.path.join(
DEFAULT_MAIN_DIR, QA_ASSETS, "testsuites")]
def download_assets(options): def download_assets(options):
@ -176,6 +177,7 @@ class PrintUsage(argparse.Action):
class LauncherConfig(Loggable): class LauncherConfig(Loggable):
def __init__(self): def __init__(self):
self.testsuites = [] self.testsuites = []
self.debug = False self.debug = False
@ -229,6 +231,7 @@ class LauncherConfig(Loggable):
# Get absolute path for main_dir and base everything on that # Get absolute path for main_dir and base everything on that
self.main_dir = os.path.abspath(self.main_dir) self.main_dir = os.path.abspath(self.main_dir)
os.environ['GST_VALIDATE_LAUNCHER_MAIN_DIR'] = self.main_dir
# default for output_dir is MAINDIR # default for output_dir is MAINDIR
if not self.output_dir: if not self.output_dir:
@ -304,9 +307,9 @@ class LauncherConfig(Loggable):
% self.clone_dir, Colors.FAIL, True) % self.clone_dir, Colors.FAIL, True)
return False return False
if (self.main_dir != DEFAULT_MAIN_DIR or if (self.main_dir != DEFAULT_MAIN_DIR or self.clone_dir != QA_ASSETS):
self.clone_dir != QA_ASSETS): local_clone_dir = os.path.join(
local_clone_dir = os.path.join(self.main_dir, self.clone_dir, "testsuites") self.main_dir, self.clone_dir, "testsuites")
if local_clone_dir not in self.testsuites_dirs: if local_clone_dir not in self.testsuites_dirs:
self.testsuites_dirs.insert(0, local_clone_dir) self.testsuites_dirs.insert(0, local_clone_dir)
if self.valgrind: if self.valgrind:
@ -479,7 +482,9 @@ Note that all testsuite should be inside python modules, so the directory should
dir_group = parser.add_argument_group( dir_group = parser.add_argument_group(
"Directories and files to be used by the launcher") "Directories and files to be used by the launcher")
dir_group.add_argument("-M", "--main-dir", dest="main_dir", dir_group.add_argument("-M", "--main-dir", dest="main_dir",
help="Main directory where to put files. Default is %s" % DEFAULT_MAIN_DIR) help="Main directory where to put files."
" Respects the GST_VALIDATE_LAUNCHER_MAIN_DIR environment variable."
" Default is %s" % DEFAULT_MAIN_DIR)
dir_group.add_argument("--testsuites-dir", dest="testsuites_dirs", action='append', dir_group.add_argument("--testsuites-dir", dest="testsuites_dirs", action='append',
help="Directory where to look for testsuites. Default is %s" help="Directory where to look for testsuites. Default is %s"
% DEFAULT_TESTSUITES_DIRS) % DEFAULT_TESTSUITES_DIRS)
@ -566,14 +571,14 @@ Note that all testsuite should be inside python modules, so the directory should
if options.list_tests: if options.list_tests:
if tests_launcher.list_tests() == -1: if tests_launcher.list_tests() == -1:
printc("\nFailling as tests have been removed/added " printc("\nFailling as tests have been removed/added "
" (--fail-on-testlist-change)", Colors.FAIL) " (--fail-on-testlist-change)", Colors.FAIL)
exit(1) exit(1)
l = tests_launcher.tests tests = tests_launcher.tests
for test in l: for test in tests:
printc(test) printc(test)
printc("\nNumber of tests: %d" % len(l), Colors.OKGREEN) printc("\nNumber of tests: %d" % len(tests), Colors.OKGREEN)
return 0 return 0
httpsrv = HTTPServer(options) httpsrv = HTTPServer(options)
@ -596,7 +601,8 @@ Note that all testsuite should be inside python modules, so the directory should
# There seems to be some issue with forking, dconf and some gtype # There seems to be some issue with forking, dconf and some gtype
# initialization that deadlocks occasionally, setting the # initialization that deadlocks occasionally, setting the
# GSettings backend make it go away. # GSettings backend make it go away.
# Also happened here: https://cgit.freedesktop.org/gstreamer/gst-plugins-good/commit/tests/check/Makefile.am?id=8e2c1d1de56bddbff22170f8b17473882e0e63f9 # Also happened here:
# https://cgit.freedesktop.org/gstreamer/gst-plugins-good/commit/tests/check/Makefile.am?id=8e2c1d1de56bddbff22170f8b17473882e0e63f9
os.environ['GSETTINGS_BACKEND'] = "memory" os.environ['GSETTINGS_BACKEND'] = "memory"
exception = None exception = None

2
validate/launcher/utils.py
View file

@ -44,7 +44,7 @@ from xml.etree import ElementTree
GST_SECOND = int(1000000000) GST_SECOND = int(1000000000)
DEFAULT_TIMEOUT = 30 DEFAULT_TIMEOUT = 30
DEFAULT_MAIN_DIR = os.path.join(os.path.expanduser("~"), "gst-validate") DEFAULT_MAIN_DIR = os.environ.get('GST_VALIDATE_LAUNCHER_MAIN_DIR', os.path.join(os.path.expanduser("~"), "gst-validate"))
DEFAULT_GST_QA_ASSETS = os.path.join( DEFAULT_GST_QA_ASSETS = os.path.join(
DEFAULT_MAIN_DIR, "gst-integration-testsuites") DEFAULT_MAIN_DIR, "gst-integration-testsuites")
DISCOVERER_COMMAND = "gst-discoverer-1.0" DISCOVERER_COMMAND = "gst-discoverer-1.0"