oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix selenium with gevent 1.2

Browse source
This commit is contained in:
shortcutme 2017-01-27 13:05:10 +01:00
parent c57d0283b3
commit 72f91a2816
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
4 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/Test/TestNoparallel.py
View file

@ -1,10 +1,7 @@
import time
import gevent
from gevent import monkey
monkey.patch_all()
import util
import gevent
class ExampleClass(object):
def __init__(self):

2
src/Test/TestRateLimit.py
View file

@ -1,8 +1,6 @@
import time
import gevent
from gevent import monkey
monkey.patch_all()
from util import RateLimit

6
src/Test/TestWeb.py
View file

@ -18,7 +18,7 @@ class WaitForPageLoad(object):
self.old_page = self.browser.find_element_by_tag_name('html')
def __exit__(self, *args):
WebDriverWait(self.browser, 20).until(staleness_of(self.old_page))
WebDriverWait(self.browser, 5).until(staleness_of(self.old_page))
@pytest.mark.usefixtures("resetSettings")
@ -34,10 +34,6 @@ class TestWeb:
assert "Forbidden" in urllib.urlopen("%s/1EU1tbG9oC1A8jz2ouVwGZyQ5asrNsE4Vr/..//sites.json" % site_url).read()
assert "Forbidden" in urllib.urlopen("%s/1EU1tbG9oC1A8jz2ouVwGZyQ5asrNsE4Vr/../../zeronet.py" % site_url).read()
def testHomepage(self, browser, site_url):
browser.get("%s/1EU1tbG9oC1A8jz2ouVwGZyQ5asrNsE4Vr" % site_url)
assert browser.title == "ZeroHello - ZeroNet"
def testLinkSecurity(self, browser, site_url):
browser.get("%s/1EU1tbG9oC1A8jz2ouVwGZyQ5asrNsE4Vr/test/security.html" % site_url)
assert browser.title == "ZeroHello - ZeroNet"

6
src/Test/conftest.py
View file

@ -49,7 +49,7 @@ if os.path.isfile("%s-temp/content.db" % config.data_dir):
import gevent
from gevent import monkey
monkey.patch_all(thread=False)
monkey.patch_all(thread=False, subprocess=False)
from Site import Site
from Site import SiteManager
@ -164,7 +164,9 @@ def user():
def browser():
try:
from selenium import webdriver
browser = webdriver.PhantomJS(executable_path=PHANTOMJS_PATH, service_log_path=os.path.devnull)
print "Starting phantomjs..."
browser = webdriver.PhantomJS(executable_path=PHANTOMJS_PATH)
print "Set window size..."
browser.set_window_size(1400, 1000)
except Exception, err:
raise pytest.skip("Test requires selenium + phantomjs: %s" % err)