From c0114f84850de3e305db694fa6613ca964abc15c Mon Sep 17 00:00:00 2001
From: browniecab <cody.browne@blindsidenetworks.com>
Date: Tue, 28 Aug 2018 13:52:04 -0400
Subject: [PATCH] Update tests
(cherry picked from commit 817957b784061fb9519eac84a719556748c6e3e6)
---
.travis.yml | 2 ++
bigbluebutton-html5/Dockerfile.test | 1 -
bigbluebutton-html5/test-html5.sh | 7 ++++++-
bigbluebutton-html5/tests/puppeteer/test-html5-check.js | 1 +
4 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 01007c70fc..5a2e21e4d1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,6 +18,8 @@ env:
- BBB_SERVER_URL=http://localhost/bigbluebutton/api
script:
+ - echo $BBB_SERVER_URL
+ - echo $BBB_SHARED_SECRET
- node test-html5-check.js
- node test-chat.js
- node test-draw.js
diff --git a/bigbluebutton-html5/Dockerfile.test b/bigbluebutton-html5/Dockerfile.test
index bd36ede47b..5f59250fcb 100644
--- a/bigbluebutton-html5/Dockerfile.test
+++ b/bigbluebutton-html5/Dockerfile.test
@@ -3,7 +3,6 @@ MAINTAINER ffdixon@bigbluebutton.org
ENV DEBIAN_FRONTEND noninteractive
# RUN echo 'Acquire::http::Proxy "http://192.168.0.130:3142 ";' > /etc/apt/apt.conf.d/01proxy
-
RUN apt-get update && apt-get install -y wget software-properties-common
RUN echo "deb http://ubuntu.bigbluebutton.org/xenial-200-dev bigbluebutton-xenial main " | tee /etc/apt/sources.list.d/bigbluebutton.list
diff --git a/bigbluebutton-html5/test-html5.sh b/bigbluebutton-html5/test-html5.sh
index 0ed4a0acd9..f9ffac10ac 100755
--- a/bigbluebutton-html5/test-html5.sh
+++ b/bigbluebutton-html5/test-html5.sh
@@ -4,7 +4,7 @@ echo "Working directory: $PWD"
# Build and run Docker image
docker build -t b2 .
-docker=$(docker run -d -p 80:80/tcp -p 443:443/tcp -p 1935:1935 -p 5066:5066 -p 3478:3478 -p 3478:3478/udp b2 -h 10.130.218.149)
+docker=$(docker run -d -p 80:80/tcp -p 443:443/tcp -p 1935:1935 -p 5066:5066 -p 3478:3478 -p 3478:3478/udp b2 -h localhost)
echo $docker
# Check if HTML5 client is ready
@@ -13,6 +13,11 @@ node test-html5-check.js
status=$?
echo $status
+conf=$(docker exec $(docker ps -q) bbb-conf --secret | grep "Secret:")
+secret=$(echo $conf | cut -d' ' -f2)
+export BBB_SHARED_SECRET=$secret
+echo $BBB_SHARED_SECRET
+
# Run tests
if [ $status -eq 0 ]; then
node test-chat.js
diff --git a/bigbluebutton-html5/tests/puppeteer/test-html5-check.js b/bigbluebutton-html5/tests/puppeteer/test-html5-check.js
index d758d81b78..d9e7a43788 100644
--- a/bigbluebutton-html5/tests/puppeteer/test-html5-check.js
+++ b/bigbluebutton-html5/tests/puppeteer/test-html5-check.js
@@ -7,6 +7,7 @@ const helper = require('./helper');
{
var bbb = url.parse(process.env.BBB_SERVER_URL)
var check = bbb.protocol + "//" + bbb.hostname + "/html5client/check";
+ console.log("HTML5 check URL: " + check);
const maxRetries = 20;
const delay = 10000;
var retryCount = 0;
--
GitLab