summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSolly Ross <sross@redhat.com>2018-07-29 19:16:56 -0400
committerSolly Ross <sross@redhat.com>2018-07-30 11:07:33 -0400
commitee3493c060d64de9e04cf33a71b33c672e6fcd8c (patch)
tree683f10decc1b82d0e23acefc24752c39ff89ebc7
parentcccf3b008abbb68abcbbda159f7b111f163788a3 (diff)
downloadnovnc-bug/fix-test-playback.tar.gz
Add a record flag to launch.shbug/fix-test-playback
Add the `--record` flag to launch.js, for easy recording when testing.
-rw-r--r--tests/vnc_playback.html2
-rwxr-xr-xutils/launch.sh6
2 files changed, 6 insertions, 2 deletions
diff --git a/tests/vnc_playback.html b/tests/vnc_playback.html
index b369078..524bb9f 100644
--- a/tests/vnc_playback.html
+++ b/tests/vnc_playback.html
@@ -12,7 +12,7 @@
window.addEventListener("load", function() {
if (window._noVNC_has_module_support) return;
var loader = document.createElement("script");
- loader.src = "vendor/browser-es-module-loader/dist/browser-es-module-loader.js";
+ loader.src = "../vendor/browser-es-module-loader/dist/browser-es-module-loader.js";
document.head.appendChild(loader);
});
</script>
diff --git a/utils/launch.sh b/utils/launch.sh
index 2007c85..ee2ca5e 100755
--- a/utils/launch.sh
+++ b/utils/launch.sh
@@ -24,6 +24,8 @@ usage() {
echo " Default: ./"
echo " --ssl-only Disable non-https connections."
echo " "
+ echo " --record FILE Record traffic to FILE.session.js"
+ echo " "
exit 2
}
@@ -36,6 +38,7 @@ CERT=""
WEB=""
proxy_pid=""
SSLONLY=""
+RECORD_ARG=""
die() {
echo "$*"
@@ -63,6 +66,7 @@ while [ "$*" ]; do
--cert) CERT="${OPTARG}"; shift ;;
--web) WEB="${OPTARG}"; shift ;;
--ssl-only) SSLONLY="--ssl-only" ;;
+ --record) RECORD_ARG="--record ${OPTARG}"; shift ;;
-h|--help) usage ;;
-*) usage "Unknown chrooter option: ${param}" ;;
*) break ;;
@@ -145,7 +149,7 @@ fi
echo "Starting webserver and WebSockets proxy on port ${PORT}"
#${HERE}/websockify --web ${WEB} ${CERT:+--cert ${CERT}} ${PORT} ${VNC_DEST} &
-${WEBSOCKIFY} ${SSLONLY} --web ${WEB} ${CERT:+--cert ${CERT}} ${PORT} ${VNC_DEST} &
+${WEBSOCKIFY} ${SSLONLY} --web ${WEB} ${CERT:+--cert ${CERT}} ${PORT} ${VNC_DEST} ${RECORD_ARG} &
proxy_pid="$!"
sleep 1
if ! ps -p ${proxy_pid} >/dev/null; then