From 74bb638f83e84f648bb300d01cd09a4f047bb568 Mon Sep 17 00:00:00 2001 From: Marcello Stanisci Date: Wed, 15 Feb 2017 17:24:26 +0100 Subject: Fix selenium launcher. --- selenium/launch_selenium_test | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) (limited to 'selenium') diff --git a/selenium/launch_selenium_test b/selenium/launch_selenium_test index 750505e..96f8e20 100755 --- a/selenium/launch_selenium_test +++ b/selenium/launch_selenium_test @@ -1,11 +1,18 @@ #!/bin/bash -# update wallet and pack extension -(cd $HOME/wallet-webex \ - && git pull \ - && ./configure \ - && make \ - && xvfb-run chromium --pack-extension $HOME/wallet-webex) +set -eu + +cd $HOME/wallet-webex +git clean -fdx + +git fetch +# reset to updated upstream branch, but only if we're tracking a branch +branch=$(git rev-parse --abbrev-ref --symbolic-full-name @{u} 2>/dev/null || echo HEAD) +git reset --hard "$branch" + +git submodule update --remote + +tsc # use 'make' once yarn problems art fixed. eval $(docker-machine env) @@ -14,10 +21,10 @@ if docker restart container_chrome > /dev/null; then echo "Chrome container succesfully restarted"; fi -# Give time to container to get fully operational +# Give time for the container to get fully operational sleep 2 # call python3 selenium script python3 $HOME/wallet-webex/selenium/withdraw_buy.py \ - --ext=$HOME/ext.crx \ + --ext-unpacked=$HOME/wallet-webex \ --remote=http://$(docker-machine ip):4444/wd/hub -- cgit v1.2.3