mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-20 23:36:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

validate: Handle setting the HTTP server local path from testsuites

Browse source
This commit is contained in:
Thibault Saunier 2014-12-02 17:32:18 +01:00
parent 22fba81138
commit 272032c0b0
1 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
validate/launcher/main.py
View file

@ -210,7 +210,7 @@ class LauncherConfig(Loggable):
self.logsdir = None self.logsdir = None
self.dest = None self.dest = None
self._using_default_paths = False self._using_default_paths = False
self.paths = None self.paths = []
self.testsuites_dir = DEFAULT_TESTSUITES_DIR self.testsuites_dir = DEFAULT_TESTSUITES_DIR
self.clone_dir = None self.clone_dir = None
@ -257,23 +257,12 @@ class LauncherConfig(Loggable):
if self.clone_dir is None: if self.clone_dir is None:
self.clone_dir = os.path.join(self.main_dir, QA_ASSETS) self.clone_dir = os.path.join(self.main_dir, QA_ASSETS)
if self.paths is None:
self._using_default_paths = True
self.paths = [os.path.join(self.clone_dir, MEDIAS_FOLDER,
"defaults")]
if not isinstance(self.paths, list): if not isinstance(self.paths, list):
self.paths = [self.paths] self.paths = [self.paths]
if self.generate_info_full is True: if self.generate_info_full is True:
self.generate_info = True self.generate_info = True
if self.http_server_dir is None:
if isinstance(self.paths, list):
self.http_server_dir = self.paths[0]
else:
self.http_server_dir = self.paths
if self.sync_all is True: if self.sync_all is True:
self.sync = True self.sync = True
if self.update_assets_command == DEFAULT_SYNC_ASSET_COMMAND: if self.update_assets_command == DEFAULT_SYNC_ASSET_COMMAND:
@ -287,6 +276,13 @@ class LauncherConfig(Loggable):
return True return True
def set_http_server_dir(self, path):
if self.http_server_dir is not None:
princ("Server directory already set to %s" % self.http_server_dir)
return
self.http_server_dir = path
def add_paths(self, paths): def add_paths(self, paths):
if not isinstance(paths, list): if not isinstance(paths, list):
paths = [paths] paths = [paths]
@ -402,11 +398,11 @@ Note that all testsuite should be inside python modules, so the directory should
" printed in the terminal") " printed in the terminal")
dir_group.add_argument("-R", "--render-path", dest="dest", dir_group.add_argument("-R", "--render-path", dest="dest",
help="Set the path to which projects should be rendered, default is OUTPUT_DIR/rendered") help="Set the path to which projects should be rendered, default is OUTPUT_DIR/rendered")
dir_group.add_argument( dir_group.add_argument("-p", "--medias-paths", dest="paths", action="append",
"-p", "--medias-paths", dest="paths", action="append", help="Paths in which to look for media files")
help="Paths in which to look for media files, default is MAIN_DIR/gst-integration-testsuites/media/defaults")
dir_group.add_argument("-a", "--clone-dir", dest="clone_dir", dir_group.add_argument("-a", "--clone-dir", dest="clone_dir",
help="Paths in which to look for media files, default is MAIN_DIR/gst-integration-testsuites") help="Paths where to clone the testuite to run "
" default is MAIN_DIR/gst-integration-testsuites")
http_server_group = parser.add_argument_group( http_server_group = parser.add_argument_group(
"Handle the HTTP server to be created") "Handle the HTTP server to be created")