zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bypass browser join confirmation in prebuilt AppRTC

Browse Source 
This is still needed by Chromium tests.
Copied from https://webrtc.googlesource.com/webrtc.DEPS/+/76533443ed95184aa45dc3b4af383fc301a53f80/copy_apprtc.py

Bug: webrtc:7602
Change-Id: I17f0159fe43176df95ad2e27ff330650d6645d67
No-Try: True
Reviewed-on: https://webrtc-review.googlesource.com/66680
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Oleh Prypin <oprypin@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22718}
This commit is contained in:
Oleh Prypin
2018-04-04 10:04:46 +02:00
committed by Commit Bot
parent 7dfd5fc3df
commit 8058fbbd6b
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
rtc_tools/testing/build_apprtc.py
View File

@ -16,6 +16,7 @@ This script needs to know the path to the 'src' directory in apprtc, the
root directory of 'go' and the output_dir. root directory of 'go' and the output_dir.
""" """
import fileinput
import os import os
import shutil import shutil
import subprocess import subprocess
@ -24,7 +25,15 @@ import sys
import utils import utils
USAGE_STR = "Usage: {} <apprtc_src_dir> <go_dir> <output_dir>" USAGE_STR = "Usage: {} <apprtc_dir> <go_dir> <output_dir>"
def _ConfigureApprtcServerToDeveloperMode(app_yaml_path):
for line in fileinput.input(app_yaml_path, inplace=True):
# We can't click past these in browser-based tests, so disable them.
line = line.replace('BYPASS_JOIN_CONFIRMATION: false',
'BYPASS_JOIN_CONFIRMATION: true')
sys.stdout.write(line)
def main(argv): def main(argv):
@ -35,11 +44,14 @@ def main(argv):
go_root_dir = os.path.abspath(argv[2]) go_root_dir = os.path.abspath(argv[2])
golang_workspace = os.path.abspath(argv[3]) golang_workspace = os.path.abspath(argv[3])
app_yaml_path = os.path.join(apprtc_dir, 'out', 'app_engine', 'app.yaml')
_ConfigureApprtcServerToDeveloperMode(app_yaml_path)
utils.RemoveDirectory(golang_workspace) utils.RemoveDirectory(golang_workspace)
golang_workspace_src = os.path.join(golang_workspace, 'src') golang_workspace_src = os.path.join(golang_workspace, 'src')
collider_dir = os.path.join(apprtc_dir, 'collider') collider_dir = os.path.join(apprtc_dir, 'src', 'collider')
shutil.copytree(collider_dir, golang_workspace_src) shutil.copytree(collider_dir, golang_workspace_src)
golang_binary = 'go%s' % ('.exe' if utils.GetPlatform() == 'win' else '') golang_binary = 'go%s' % ('.exe' if utils.GetPlatform() == 'win' else '')

4
rtc_tools/testing/setup_apprtc.py
View File

@ -34,11 +34,11 @@ def main(argv):
output_dir]) output_dir])
build_apprtc_path = os.path.join(SCRIPT_DIR, 'build_apprtc.py') build_apprtc_path = os.path.join(SCRIPT_DIR, 'build_apprtc.py')
apprtc_src_dir = os.path.join(output_dir, 'apprtc', 'src') apprtc_dir = os.path.join(output_dir, 'apprtc')
go_dir = os.path.join(output_dir, 'go') go_dir = os.path.join(output_dir, 'go')
collider_dir = os.path.join(output_dir, 'collider') collider_dir = os.path.join(output_dir, 'collider')
utils.RunSubprocessWithRetry([sys.executable, build_apprtc_path, utils.RunSubprocessWithRetry([sys.executable, build_apprtc_path,
apprtc_src_dir, go_dir, collider_dir]) apprtc_dir, go_dir, collider_dir])
if __name__ == '__main__': if __name__ == '__main__':