maya-chen/flask
1
0
Fork 0
forked from orbit-oss/flask
Code Pull requests Activity

Merge branch 'master' of github.com:mitsuhiko/flask

Browse source
This commit is contained in:
Armin Ronacher 2010-07-28 01:28:31 +02:00
commit 8e7d29176a
4 changed files with 11 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
tests/flaskext_test.py
View file

@ -209,7 +209,7 @@ downloadcache=%(cache)s
def create_tox_ini(checkout_path, interpreters, flask_dep):
tox_path = os.path.join(checkout_path, 'tox.ini')
tox_path = os.path.join(checkout_path, 'tox-flask-test.ini')
if not os.path.exists(tox_path):
with open(tox_path, 'w') as f:
f.write(tox_template % {
@ -217,6 +217,7 @@ def create_tox_ini(checkout_path, interpreters, flask_dep):
'cache': tdir,
'deps': flask_dep
})
return tox_path
def iter_extensions(only_approved=True):
@ -244,12 +245,9 @@ def test_extension(name, interpreters, flask_dep):
# if there is a tox.ini, remove it, it will cause troubles
# for us. Remove it if present, we are running tox ourselves
# afterall.
toxini = os.path.join(checkout_path, 'tox.ini')
if os.path.isfile(toxini):
os.remove(toxini)
create_tox_ini(checkout_path, interpreters, flask_dep)
rv = subprocess.call(['tox'], cwd=checkout_path)
rv = subprocess.call(['tox', '-c', 'tox-flask-test.ini'], cwd=checkout_path)
return TestResult(name, checkout_path, rv, interpreters)