Skip to content
Snippets Groups Projects
Commit 2fd2578a authored by Stéphane Diemer's avatar Stéphane Diemer
Browse files

Handle ms testing suite git errors (refs #24994).

parent ea4909e4
No related branches found
No related tags found
No related merge requests found
...@@ -99,9 +99,9 @@ class Tester(): ...@@ -99,9 +99,9 @@ class Tester():
log('USAGE: ' + self.USAGE) log('USAGE: ' + self.USAGE)
sys.exit(1) sys.exit(1)
else: else:
log("Optional target user : %s" % arg) log('Optional target user : %s' % arg)
if not os.path.isdir(os.path.join('/home', arg)): if not os.path.isdir(os.path.join('/home', arg)):
log("Mediaserver user %s does not exist" % arg) log('Mediaserver user %s does not exist' % arg)
sys.exit(1) sys.exit(1)
else: else:
msuser = arg msuser = arg
...@@ -240,13 +240,15 @@ class Tester(): ...@@ -240,13 +240,15 @@ class Tester():
ms_path = os.path.join(path, 'ms-testing-suite') ms_path = os.path.join(path, 'ms-testing-suite')
if not os.path.exists(ms_path): if not os.path.exists(ms_path):
log('Cloning ms-testing-suite in "%s".' % ms_path) log('Cloning ms-testing-suite in "%s".' % ms_path)
subprocess.check_call(['git', 'clone', '--recursive', 'https://panel.ubicast.eu/git/mediaserver/ms-testing-suite.git', ms_path]) subprocess.call(['git', 'clone', '--recursive', 'https://panel.ubicast.eu/git/mediaserver/ms-testing-suite.git', ms_path])
log('Updating ms-testing-suite in "%s".' % ms_path) if os.path.exists(ms_path):
os.chdir(ms_path) log('Updating ms-testing-suite in "%s".' % ms_path)
subprocess.check_call(['git', 'pull', '--recurse-submodules']) os.chdir(ms_path)
subprocess.check_call(['git', 'submodule', 'update', '--init', '--recursive']) subprocess.call(['git', 'pull', '--recurse-submodules'])
os.chdir(self.root_dir) subprocess.call(['git', 'submodule', 'update', '--init', '--recursive'])
os.chdir(self.root_dir)
# Add tests to list # Add tests to list
log('Add MediaServer tests if available.' % ms_path)
wowza_dir = '/usr/local/WowzaStreamingEngine' wowza_dir = '/usr/local/WowzaStreamingEngine'
etc_lives_conf = '/etc/mediaserver/lives_conf.py' etc_lives_conf = '/etc/mediaserver/lives_conf.py'
local_lives_conf = '/home/%s/msinstance/conf/lives_conf.py' local_lives_conf = '/home/%s/msinstance/conf/lives_conf.py'
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment