Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ python:
sudo: required
dist: trusty
addons:
firefox: "latest"
firefox: "45.0"

before_install:
- firefox --version
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ venv:
aptdeps:
@echo "Installing apt dependencies"
@echo "---------------------------"
apt-get update
-apt-get update
apt-get install -o Dpkg::Options::="--force-confold" --force-yes -y docker-engine npm nodejs-legacy python3-pip python3.4-venv
pip install --upgrade pip
npm install -g configurable-http-proxy
Expand Down
2 changes: 1 addition & 1 deletion dev-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
flake8
coverage
selenium
selenium==2.53.6
17 changes: 6 additions & 11 deletions selenium_tests/test_start_stop_container.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,13 @@ def test_start_stop_container(self):
driver.find_element_by_id("password_input").send_keys("test")
driver.find_element_by_id("login_submit").click()
driver.find_element_by_name("action").click()
for i in range(60):
try:
if "noVNC" == driver.title:
break
except:
pass
time.sleep(1)
else:
self.fail("time out")
driver.find_element_by_link_text("Close").click()
driver.find_element_by_name("action").click()
self.wait_for(lambda: "noVNC" == driver.title)
driver.execute_script(
"arguments[0].click()",
driver.find_element_by_link_text("Close")
)
self.wait_for(lambda: "noVNC" != driver.title)
driver.find_element_by_name("action").click()
driver.find_element_by_xpath("//i").click()
driver.find_element_by_xpath("(//button[@name='action'])[2]").click()
self.wait_for(
Expand Down