summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThibault Saunier <tsaunier@gnome.org>2015-08-04 15:21:16 +0200
committerThibault Saunier <tsaunier@gnome.org>2015-08-04 15:23:54 +0200
commit1fd14635ed142dbd5badfa2e50c2a538c1eb9339 (patch)
tree40721de8039f76eea3507bf4eacea5c34a4e6d53
parentbc297a82958455c6a9ec694cc35d4576c3da6635 (diff)
validate: launcher: Add a --force-sync option
Which should put the testsuite in a clean state (basically using git reset --hard for git based testsuite for example)
-rw-r--r--validate/launcher/main.py12
1 files changed, 8 insertions, 4 deletions
diff --git a/validate/launcher/main.py b/validate/launcher/main.py
index b6efe6f..f12e35d 100644
--- a/validate/launcher/main.py
+++ b/validate/launcher/main.py
@@ -131,8 +131,8 @@ http://wiki.pitivi.org/wiki/Bug_reporting#Debug_logs).
),
DEFAULT_MAIN_DIR,
"\n * ".join([getattr(Protocols, att) for att in
- dir(Protocols) if isinstance(getattr(Protocols, att), str)
- and not att.startswith("_")]))
+ dir(Protocols) if isinstance(getattr(Protocols, att), str) and not
+ att.startswith("_")]))
QA_ASSETS = "gst-integration-testsuites"
MEDIAS_FOLDER = "medias"
@@ -211,6 +211,7 @@ class LauncherConfig(Loggable):
self.get_assets_command = "git clone"
self.remote_assets_url = DEFAULT_GST_QA_ASSETS_REPO
self.sync = False
+ self.force_sync = False
self.sync_all = False
def cleanup(self):
@@ -263,7 +264,7 @@ class LauncherConfig(Loggable):
if self.generate_info_full is True:
self.generate_info = True
- if self.sync_all is True:
+ if self.sync_all is True or self.force_sync is True:
self.sync = True
if not self.sync and not os.path.exists(self.clone_dir) and \
@@ -459,6 +460,9 @@ Note that all testsuite should be inside python modules, so the directory should
help="Url to the remote assets (default:%s)" % DEFAULT_GST_QA_ASSETS_REPO)
assets_group.add_argument("-S", "--sync", dest="sync", action="store_true",
help="Synchronize asset repository")
+ assets_group.add_argument("-fs", "--force-sync", dest="force_sync", action="store_true",
+ help="Synchronize asset repository reseting any change that might have"
+ " happened in the testsuite")
assets_group.add_argument("--sync-all", dest="sync_all", action="store_true",
help="Synchronize asset repository,"
" including big media files")
@@ -513,7 +517,7 @@ Note that all testsuite should be inside python modules, so the directory should
os.environ["DISPLAY"] = vfb_server.display_id
if options.httponly is True:
- print "Running HTTP server only"
+ print("Running HTTP server only")
return
e = None