aitzol/Plume
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update Caddyfile for integration tests

Browse Source
This commit is contained in:
Ana Gelez 2020-08-10 18:03:51 +02:00
parent 4c6fb83793
commit 925254983e
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.circleci/images/plume-buildenv/Caddyfile
View File

@ -1,5 +1,5 @@
localhost:443 { localhost:443 {
proxy / localhost:7878 { proxy / integration:7878 {
transparent transparent
} }
tls self_signed tls self_signed

2
.drone.jsonnet
View File

@ -5,7 +5,7 @@
// This Docker image contains everything we need to build Plume. // This Docker image contains everything we need to build Plume.
// Its Dockerfile can be found at https://git.joinplu.me/plume/buildenv // Its Dockerfile can be found at https://git.joinplu.me/plume/buildenv
local plumeEnv = "plumeorg/plume-buildenv:v0.0.9"; local plumeEnv = "plumeorg/plume-buildenv:v0.2.0";
// Common cache config // Common cache config
local cacheConfig(name, extra) = { local cacheConfig(name, extra) = {

2
script/browser_test/utils.py
View File

@ -21,4 +21,4 @@ class Browser(unittest.TestCase):
def get(self, url): def get(self, url):
# Like "selenium", integration is mapped to the container that runs the plume instance # Like "selenium", integration is mapped to the container that runs the plume instance
return self.driver.get("https://integration" + url) return self.driver.get("https://localhost" + url)

2
script/run_browser_test.sh
View File

@ -12,7 +12,7 @@ plm users new -n admin -N 'Admin' -e 'email@exemple.com' -p 'password'
plume & plume &
caddy -conf /Caddyfile & caddy -conf /Caddyfile &
until curl http://localhost:7878/test/health -f; do sleep 1; done 2>/dev/null >/dev/null until curl http://integration:7878/test/health -f; do sleep 1; done 2>/dev/null >/dev/null
cd $(dirname $0)/browser_test/ cd $(dirname $0)/browser_test/
python3 -m unittest *.py python3 -m unittest *.py