Skip to content

Commit

Permalink
Changed assert to self.assert_ where it was still in place
Browse files Browse the repository at this point in the history
  • Loading branch information
@mitsuhiko
mitsuhiko committed Aug 26, 2011
1 parent 3069e2d commit fc2caa4
Show file tree
Hide file tree
Showing 8 changed files with 86 additions and 86 deletions.
80 changes: 40 additions & 40 deletions flask/testsuite/basic.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ def more():
self.assert_equal(sorted(rv.allow), ['GET', 'HEAD', 'OPTIONS'])
rv = c.head('/')
self.assert_equal(rv.status_code, 200)
assert not rv.data # head truncates
self.assert_(not rv.data) # head truncates
self.assert_equal(c.post('/more').data, 'POST')
self.assert_equal(c.get('/more').data, 'GET')
rv = c.delete('/more')
Expand All @@ -97,7 +97,7 @@ def more():
self.assert_equal(sorted(rv.allow), ['GET', 'HEAD', 'OPTIONS'])
rv = c.head('/')
self.assert_equal(rv.status_code, 200)
assert not rv.data # head truncates
self.assert_(not rv.data) # head truncates
self.assert_equal(c.post('/more').data, 'POST')
self.assert_equal(c.get('/more').data, 'GET')
rv = c.delete('/more')
Expand Down Expand Up @@ -168,8 +168,8 @@ def index():
flask.session['testing'] = 42
return 'Hello World'
rv = app.test_client().get('/', 'http://example.com/')
assert 'domain=.example.com' in rv.headers['set-cookie'].lower()
assert 'httponly' in rv.headers['set-cookie'].lower()
self.assert_('domain=.example.com' in rv.headers['set-cookie'].lower())
self.assert_('httponly' in rv.headers['set-cookie'].lower())

def test_session_using_server_name_and_port(self):
app = flask.Flask(__name__)
Expand All @@ -182,8 +182,8 @@ def index():
flask.session['testing'] = 42
return 'Hello World'
rv = app.test_client().get('/', 'http://example.com:8080/')
assert 'domain=.example.com' in rv.headers['set-cookie'].lower()
assert 'httponly' in rv.headers['set-cookie'].lower()
self.assert_('domain=.example.com' in rv.headers['set-cookie'].lower())
self.assert_('httponly' in rv.headers['set-cookie'].lower())

def test_session_using_application_root(self):
class PrefixPathMiddleware(object):
Expand All @@ -205,19 +205,19 @@ def index():
flask.session['testing'] = 42
return 'Hello World'
rv = app.test_client().get('/', 'http://example.com:8080/')
assert 'path=/bar' in rv.headers['set-cookie'].lower()
self.assert_('path=/bar' in rv.headers['set-cookie'].lower())

def test_missing_session(self):
app = flask.Flask(__name__)
def expect_exception(f, *args, **kwargs):
try:
f(*args, **kwargs)
except RuntimeError, e:
assert e.args and 'session is unavailable' in e.args[0]
self.assert_(e.args and 'session is unavailable' in e.args[0])
else:
assert False, 'expected exception'
self.assert_(False, 'expected exception')
with app.test_request_context():
assert flask.session.get('missing_key') is None
self.assert_(flask.session.get('missing_key') is None)
expect_exception(flask.session.__setitem__, 'foo', 42)
expect_exception(flask.session.pop, 'foo')

Expand All @@ -237,7 +237,7 @@ def test():

client = app.test_client()
rv = client.get('/')
assert 'set-cookie' in rv.headers
self.assert_('set-cookie' in rv.headers)
match = re.search(r'\bexpires=([^;]+)', rv.headers['set-cookie'])
expires = parse_date(match.group())
expected = datetime.utcnow() + app.permanent_session_lifetime
Expand All @@ -250,20 +250,20 @@ def test():

permanent = False
rv = app.test_client().get('/')
assert 'set-cookie' in rv.headers
self.assert_('set-cookie' in rv.headers)
match = re.search(r'\bexpires=([^;]+)', rv.headers['set-cookie'])
assert match is None
self.assert_(match is None)

def test_flashes(self):
app = flask.Flask(__name__)
app.secret_key = 'testkey'

with app.test_request_context():
assert not flask.session.modified
self.assert_(not flask.session.modified)
flask.flash('Zap')
flask.session.modified = False
flask.flash('Zip')
assert flask.session.modified
self.assert_(flask.session.modified)
self.assert_equal(list(flask.get_flashed_messages()), ['Zap', 'Zip'])

def test_extended_flashing(self):
Expand Down Expand Up @@ -308,12 +308,12 @@ def after_request(response):
return response
@app.route('/')
def index():
assert 'before' in evts
assert 'after' not in evts
self.assert_('before' in evts)
self.assert_('after' not in evts)
return 'request'
assert 'after' not in evts
self.assert_('after' not in evts)
rv = app.test_client().get('/').data
assert 'after' in evts
self.assert_('after' in evts)
self.assert_equal(rv, 'request|after')

def test_teardown_request_handler(self):
Expand All @@ -328,7 +328,7 @@ def root():
return "Response"
rv = app.test_client().get('/')
self.assert_equal(rv.status_code, 200)
assert 'Response' in rv.data
self.assert_('Response' in rv.data)
self.assert_equal(len(called), 1)

def test_teardown_request_handler_debug_mode(self):
Expand All @@ -344,7 +344,7 @@ def root():
return "Response"
rv = app.test_client().get('/')
self.assert_equal(rv.status_code, 200)
assert 'Response' in rv.data
self.assert_('Response' in rv.data)
self.assert_equal(len(called), 1)

def test_teardown_request_handler_error(self):
Expand Down Expand Up @@ -377,7 +377,7 @@ def fails():
1/0
rv = app.test_client().get('/')
self.assert_equal(rv.status_code, 500)
assert 'Internal Server Error' in rv.data
self.assert_('Internal Server Error' in rv.data)
self.assert_equal(len(called), 2)

def test_before_after_request_order(self):
Expand Down Expand Up @@ -451,7 +451,7 @@ class MyException(Exception):
app = flask.Flask(__name__)
@app.errorhandler(MyException)
def handle_my_exception(e):
assert isinstance(e, MyException)
self.assert_(isinstance(e, MyException))
return '42'
@app.route('/')
def index():
Expand All @@ -474,7 +474,7 @@ def fail():
try:
c.get('/fail')
except KeyError, e:
assert isinstance(e, BadRequest)
self.assert_(isinstance(e, BadRequest))
else:
self.fail('Expected exception')

Expand Down Expand Up @@ -509,8 +509,8 @@ def index():
try:
c.post('/fail', data={'foo': 'index.txt'})
except DebugFilesKeyError, e:
assert 'no file contents were transmitted' in str(e)
assert 'This was submitted: "index.txt"' in str(e)
self.assert_('no file contents were transmitted' in str(e))
self.assert_('This was submitted: "index.txt"' in str(e))
else:
self.fail('Expected exception')

Expand Down Expand Up @@ -572,8 +572,8 @@ def hello():
pass
with app.test_request_context():
self.assert_equal(flask.url_for('hello', name='test x'), '/hello/test%20x')
assert flask.url_for('hello', name='test x', _external=True) \
== 'http://localhost/hello/test%20x'
self.assert_equal(flask.url_for('hello', name='test x', _external=True),
'http://localhost/hello/test%20x')

def test_custom_converters(self):
from werkzeug.routing import BaseConverter
Expand All @@ -597,8 +597,8 @@ def test_static_files(self):
self.assert_equal(rv.status_code, 200)
self.assert_equal(rv.data.strip(), '<h1>Hello World!</h1>')
with app.test_request_context():
assert flask.url_for('static', filename='index.html') \
== '/static/index.html'
self.assert_equal(flask.url_for('static', filename='index.html'),
'/static/index.html')

def test_none_response(self):
app = flask.Flask(__name__)
Expand All @@ -611,7 +611,7 @@ def test():
self.assert_equal(str(e), 'View function did not return a response')
pass
else:
assert "Expected ValueError"
self.assert_("Expected ValueError")

def test_request_locals(self):
self.assert_equal(repr(flask.g), '<LocalProxy unbound>')
Expand Down Expand Up @@ -641,7 +641,7 @@ def sub():
with app.test_request_context('/', environ_overrides={'HTTP_HOST': 'localhost'}):
pass
except Exception, e:
assert isinstance(e, ValueError)
self.assert_(isinstance(e, ValueError))
self.assert_equal(str(e), "the server name provided " +
"('localhost.localdomain:5000') does not match the " + \
"server name from the WSGI environment ('localhost')")
Expand Down Expand Up @@ -768,11 +768,11 @@ def test_max_content_length(self):
@app.before_request
def always_first():
flask.request.form['myfile']
assert False
self.assert_(False)
@app.route('/accept', methods=['POST'])
def accept_file():
flask.request.form['myfile']
assert False
self.assert_(False)
@app.errorhandler(413)
def catcher(error):
return '42'
Expand Down Expand Up @@ -889,17 +889,17 @@ def meh():
self.assert_equal(index(), 'Hello World!')
with app.test_request_context('/meh'):
self.assert_equal(meh(), 'http://localhost/meh')
assert flask._request_ctx_stack.top is None
self.assert_(flask._request_ctx_stack.top is None)

def test_context_test(self):
app = flask.Flask(__name__)
assert not flask.request
assert not flask.has_request_context()
self.assert_(not flask.request)
self.assert_(not flask.has_request_context())
ctx = app.test_request_context()
ctx.push()
try:
assert flask.request
assert flask.has_request_context()
self.assert_(flask.request)
self.assert_(flask.has_request_context())
finally:
ctx.pop()

Expand All @@ -918,7 +918,7 @@ def index():
except RuntimeError:
pass
else:
assert 0, 'expected runtime error'
self.assert_(0, 'expected runtime error')


class SubdomainTestCase(FlaskTestCase):
Expand Down
18 changes: 9 additions & 9 deletions flask/testsuite/blueprints.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,16 +173,16 @@ def test_templates_and_static(self):
self.assert_equal(rv.data.strip(), '/* nested file */')

with app.test_request_context():
assert flask.url_for('admin.static', filename='test.txt') \
== '/admin/static/test.txt'
self.assert_equal(flask.url_for('admin.static', filename='test.txt'),
'/admin/static/test.txt')

with app.test_request_context():
try:
flask.render_template('missing.html')
except TemplateNotFound, e:
self.assert_equal(e.name, 'missing.html')
else:
assert 0, 'expected exception'
self.assert_(0, 'expected exception')

with flask.Flask(__name__).test_request_context():
self.assert_equal(flask.render_template('nested/nested.txt'), 'I\'m nested')
Expand All @@ -198,13 +198,13 @@ def test_safe_access(self):
except NotFound:
pass
else:
assert 0, 'expected exception'
self.assert_(0, 'expected exception')
try:
f('../__init__.py')
except NotFound:
pass
else:
assert 0, 'expected exception'
self.assert_(0, 'expected exception')

# testcase for a security issue that may exist on windows systems
import os
Expand All @@ -217,7 +217,7 @@ def test_safe_access(self):
except NotFound:
pass
else:
assert 0, 'expected exception'
self.assert_(0, 'expected exception')
finally:
os.path = old_path

Expand Down Expand Up @@ -355,16 +355,16 @@ def test_templates_and_static(self):
self.assert_equal(rv.data.strip(), '/* nested file */')

with app.test_request_context():
assert flask.url_for('admin.static', filename='test.txt') \
== '/admin/static/test.txt'
self.assert_equal(flask.url_for('admin.static', filename='test.txt'),
'/admin/static/test.txt')

with app.test_request_context():
try:
flask.render_template('missing.html')
except TemplateNotFound, e:
self.assert_equal(e.name, 'missing.html')
else:
assert 0, 'expected exception'
self.assert_(0, 'expected exception')

with flask.Flask(__name__).test_request_context():
self.assert_equal(flask.render_template('nested/nested.txt'), 'I\'m nested')
Expand Down
20 changes: 10 additions & 10 deletions flask/testsuite/config.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class ConfigTestCase(FlaskTestCase):
def common_object_test(self, app):
self.assert_equal(app.secret_key, 'devkey')
self.assert_equal(app.config['TEST_KEY'], 'foo')
assert 'ConfigTestCase' not in app.config
self.assert_('ConfigTestCase' not in app.config)

def test_config_from_file(self):
app = flask.Flask(__name__)
Expand Down Expand Up @@ -54,13 +54,13 @@ def test_config_from_envvar(self):
try:
app.config.from_envvar('FOO_SETTINGS')
except RuntimeError, e:
assert "'FOO_SETTINGS' is not set" in str(e)
self.assert_("'FOO_SETTINGS' is not set" in str(e))
else:
assert 0, 'expected exception'
assert not app.config.from_envvar('FOO_SETTINGS', silent=True)
self.assert_(0, 'expected exception')
self.assert_(not app.config.from_envvar('FOO_SETTINGS', silent=True))

os.environ = {'FOO_SETTINGS': __file__.rsplit('.')[0] + '.py'}
assert app.config.from_envvar('FOO_SETTINGS')
self.assert_(app.config.from_envvar('FOO_SETTINGS'))
self.common_object_test(app)
finally:
os.environ = env
Expand All @@ -71,12 +71,12 @@ def test_config_missing(self):
app.config.from_pyfile('missing.cfg')
except IOError, e:
msg = str(e)
assert msg.startswith('[Errno 2] Unable to load configuration '
'file (No such file or directory):')
assert msg.endswith("missing.cfg'")
self.assert_(msg.startswith('[Errno 2] Unable to load configuration '
'file (No such file or directory):'))
self.assert_(msg.endswith("missing.cfg'"))
else:
assert 0, 'expected config'
assert not app.config.from_pyfile('missing.cfg', silent=True)
self.assert_(0, 'expected config')
self.assert_(not app.config.from_pyfile('missing.cfg', silent=True))


class InstanceTestCase(FlaskTestCase):
Expand Down
2 changes: 1 addition & 1 deletion flask/testsuite/deprecations.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def foo():
c = app.test_client()
self.assert_equal(c.get('/').data, '42')
self.assert_equal(len(log), 1)
assert 'init_jinja_globals' in str(log[0]['message'])
self.assert_('init_jinja_globals' in str(log[0]['message']))


def suite():
Expand Down
Loading

0 comments on commit fc2caa4

Please sign in to comment.