summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGael Pasgrimaud <gael@gawel.org>2012-12-06 02:47:53 +0100
committerGael Pasgrimaud <gael@gawel.org>2012-12-06 02:47:53 +0100
commitb264aef126e4f9f1aabab7d190a83246fc6574fb (patch)
tree74d8171223f530aaab6e1eccc84b97929b57be07
parent510e9880d53fcf7c51f593d86bb9b3ddc51fb52d (diff)
downloadwebtest-b264aef126e4f9f1aabab7d190a83246fc6574fb.tar.gz
use distribute
-rwxr-xr-xtests/bootstrap.sh2
-rw-r--r--tests/test_casperjs.py3
2 files changed, 2 insertions, 3 deletions
diff --git a/tests/bootstrap.sh b/tests/bootstrap.sh
index 011a14a..0c6061e 100755
--- a/tests/bootstrap.sh
+++ b/tests/bootstrap.sh
@@ -1,6 +1,6 @@
#!/bin/bash
if ! [ -x bin/casperjs ]; then
- python2.7 bootstrap.py
+ python2.7 bootstrap.py -d
bin/buildout install casperjs
fi
diff --git a/tests/test_casperjs.py b/tests/test_casperjs.py
index 4980fed..c3c75d5 100644
--- a/tests/test_casperjs.py
+++ b/tests/test_casperjs.py
@@ -4,7 +4,6 @@ import os
import webob
import webtest
from webob import exc
-from webtest import ext
from tests.compat import u
#if PY3:
@@ -49,5 +48,5 @@ def application(environ, start_response):
def test_casperjs():
app = webtest.TestApp(application)
- with webtest.casperjs(app) as run:
+ with webtest.casperjs(app, timeout=2) as run:
run('test_casperjs.js')