orbit-oss/flask
4
4
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #862 from bikerm16/master

Browse source 
Minor test fixes
This commit is contained in:
Kenneth Reitz 2014-03-21 16:39:13 -04:00
commit 4c0253f9fd
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
flask/testsuite/ext.py
View file

@ -125,7 +125,9 @@ class ExtImportHookTestCase(FlaskTestCase):
next = tb.tb_next.tb_next next = tb.tb_next.tb_next
if not PY2: if not PY2:
next = next.tb_next next = next.tb_next
self.assert_in('flask_broken/__init__.py', next.tb_frame.f_code.co_filename)
import os.path
self.assert_in(os.path.join('flask_broken', '__init__.py'), next.tb_frame.f_code.co_filename)
def suite(): def suite():

2
flask/testsuite/helpers.py
View file

@ -269,7 +269,7 @@ class SendfileTestCase(FlaskTestCase):
app = flask.Flask(__name__) app = flask.Flask(__name__)
with catch_warnings() as captured: with catch_warnings() as captured:
with app.test_request_context(): with app.test_request_context():
f = open(os.path.join(app.root_path, 'static/index.html')) f = open(os.path.join(app.root_path, 'static/index.html'), mode='rb')
rv = flask.send_file(f) rv = flask.send_file(f)
rv.direct_passthrough = False rv.direct_passthrough = False
with app.open_resource('static/index.html') as f: with app.open_resource('static/index.html') as f: