From fc2caa4b9c75a6ee8569495008efd1f37c27a8cb Mon Sep 17 00:00:00 2001 From: Armin Ronacher Date: Fri, 26 Aug 2011 11:43:27 +0100 Subject: [PATCH] Changed assert to self.assert_ where it was still in place --- flask/testsuite/basic.py | 80 ++++++++++++++++----------------- flask/testsuite/blueprints.py | 18 ++++---- flask/testsuite/config.py | 20 ++++----- flask/testsuite/deprecations.py | 2 +- flask/testsuite/helpers.py | 34 +++++++------- flask/testsuite/signals.py | 2 +- flask/testsuite/templating.py | 12 ++--- flask/testsuite/testing.py | 4 +- 8 files changed, 86 insertions(+), 86 deletions(-) diff --git a/flask/testsuite/basic.py b/flask/testsuite/basic.py index 8c2be901c2..d09ec92e8e 100644 --- a/flask/testsuite/basic.py +++ b/flask/testsuite/basic.py @@ -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') @@ -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') @@ -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__) @@ -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): @@ -205,7 +205,7 @@ 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__) @@ -213,11 +213,11 @@ 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') @@ -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 @@ -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): @@ -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): @@ -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): @@ -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): @@ -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): @@ -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(): @@ -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') @@ -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') @@ -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 @@ -597,8 +597,8 @@ def test_static_files(self): self.assert_equal(rv.status_code, 200) self.assert_equal(rv.data.strip(), '

Hello World!

') 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__) @@ -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), '') @@ -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')") @@ -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' @@ -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() @@ -918,7 +918,7 @@ def index(): except RuntimeError: pass else: - assert 0, 'expected runtime error' + self.assert_(0, 'expected runtime error') class SubdomainTestCase(FlaskTestCase): diff --git a/flask/testsuite/blueprints.py b/flask/testsuite/blueprints.py index fdd63fee59..88e2be36a8 100644 --- a/flask/testsuite/blueprints.py +++ b/flask/testsuite/blueprints.py @@ -173,8 +173,8 @@ 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: @@ -182,7 +182,7 @@ def test_templates_and_static(self): 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') @@ -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 @@ -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 @@ -355,8 +355,8 @@ 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: @@ -364,7 +364,7 @@ def test_templates_and_static(self): 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') diff --git a/flask/testsuite/config.py b/flask/testsuite/config.py index 2b689bc05c..b9fa6b48f7 100644 --- a/flask/testsuite/config.py +++ b/flask/testsuite/config.py @@ -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__) @@ -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 @@ -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): diff --git a/flask/testsuite/deprecations.py b/flask/testsuite/deprecations.py index 531f7f82f2..062f40b0cb 100644 --- a/flask/testsuite/deprecations.py +++ b/flask/testsuite/deprecations.py @@ -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(): diff --git a/flask/testsuite/helpers.py b/flask/testsuite/helpers.py index 5049464011..4bd05e3d6d 100644 --- a/flask/testsuite/helpers.py +++ b/flask/testsuite/helpers.py @@ -108,7 +108,7 @@ def test_send_file_regular(self): app = flask.Flask(__name__) with app.test_request_context(): rv = flask.send_file('static/index.html') - assert rv.direct_passthrough + self.assert_(rv.direct_passthrough) self.assert_equal(rv.mimetype, 'text/html') with app.open_resource('static/index.html') as f: self.assert_equal(rv.data, f.read()) @@ -118,8 +118,8 @@ def test_send_file_xsendfile(self): app.use_x_sendfile = True with app.test_request_context(): rv = flask.send_file('static/index.html') - assert rv.direct_passthrough - assert 'x-sendfile' in rv.headers + self.assert_(rv.direct_passthrough) + self.assert_('x-sendfile' in rv.headers) self.assert_equal(rv.headers['x-sendfile'], os.path.join(app.root_path, 'static/index.html')) self.assert_equal(rv.mimetype, 'text/html') @@ -142,7 +142,7 @@ def test_send_file_object(self): f = open(os.path.join(app.root_path, 'static/index.html')) rv = flask.send_file(f) self.assert_equal(rv.mimetype, 'text/html') - assert 'x-sendfile' in rv.headers + self.assert_('x-sendfile' in rv.headers) self.assert_equal(rv.headers['x-sendfile'], os.path.join(app.root_path, 'static/index.html')) # mimetypes + etag @@ -170,7 +170,7 @@ def test_send_file_object(self): with app.test_request_context(): f = StringIO('Test') rv = flask.send_file(f) - assert 'x-sendfile' not in rv.headers + self.assert_('x-sendfile' not in rv.headers) # etags self.assert_equal(len(captured), 1) @@ -207,10 +207,10 @@ class LoggingTestCase(FlaskTestCase): def test_logger_cache(self): app = flask.Flask(__name__) logger1 = app.logger - assert app.logger is logger1 + self.assert_(app.logger is logger1) self.assert_equal(logger1.name, __name__) app.logger_name = __name__ + '/test_logger_cache' - assert app.logger is not logger1 + self.assert_(app.logger is not logger1) def test_debug_log(self): app = flask.Flask(__name__) @@ -230,10 +230,10 @@ def exc(): with catch_stderr() as err: c.get('/') out = err.getvalue() - assert 'WARNING in helpers [' in out - assert os.path.basename(__file__.rsplit('.')[0] + '.py') in out - assert 'the standard library is dead' in out - assert 'this is a debug statement' in out + self.assert_('WARNING in helpers [' in out) + self.assert_(os.path.basename(__file__.rsplit('.')[0] + '.py') in out) + self.assert_('the standard library is dead' in out) + self.assert_('this is a debug statement' in out) with catch_stderr() as err: try: @@ -241,7 +241,7 @@ def exc(): except ZeroDivisionError: pass else: - assert False, 'debug log ate the exception' + self.assert_(False, 'debug log ate the exception') def test_exception_logging(self): out = StringIO() @@ -255,13 +255,13 @@ def index(): 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) err = out.getvalue() - assert 'Exception on / [GET]' in err - assert 'Traceback (most recent call last):' in err - assert '1/0' in err - assert 'ZeroDivisionError:' in err + self.assert_('Exception on / [GET]' in err) + self.assert_('Traceback (most recent call last):' in err) + self.assert_('1/0' in err) + self.assert_('ZeroDivisionError:' in err) def test_processor_exceptions(self): app = flask.Flask(__name__) diff --git a/flask/testsuite/signals.py b/flask/testsuite/signals.py index d9054a47bf..da1a68cab3 100644 --- a/flask/testsuite/signals.py +++ b/flask/testsuite/signals.py @@ -91,7 +91,7 @@ def record(sender, exception): try: self.assert_equal(app.test_client().get('/').status_code, 500) self.assert_equal(len(recorded), 1) - assert isinstance(recorded[0], ZeroDivisionError) + self.assert_(isinstance(recorded[0], ZeroDivisionError)) finally: flask.got_request_exception.disconnect(record, app) diff --git a/flask/testsuite/templating.py b/flask/testsuite/templating.py index 20d7a16f26..eadbdcf6d4 100644 --- a/flask/testsuite/templating.py +++ b/flask/testsuite/templating.py @@ -70,10 +70,10 @@ def index(): def test_no_escaping(self): app = flask.Flask(__name__) with app.test_request_context(): - assert flask.render_template_string('{{ foo }}', - foo='') == '' - assert flask.render_template('mail.txt', foo='') \ - == ' Mail' + self.assert_equal(flask.render_template_string('{{ foo }}', + foo=''), '') + self.assert_equal(flask.render_template('mail.txt', foo=''), + ' Mail') def test_macros(self): app = flask.Flask(__name__) @@ -86,7 +86,7 @@ def test_template_filter(self): @app.template_filter() def my_reverse(s): return s[::-1] - assert 'my_reverse' in app.jinja_env.filters.keys() + self.assert_('my_reverse' in app.jinja_env.filters.keys()) self.assert_equal(app.jinja_env.filters['my_reverse'], my_reverse) self.assert_equal(app.jinja_env.filters['my_reverse']('abcd'), 'dcba') @@ -95,7 +95,7 @@ def test_template_filter_with_name(self): @app.template_filter('strrev') def my_reverse(s): return s[::-1] - assert 'strrev' in app.jinja_env.filters.keys() + self.assert_('strrev' in app.jinja_env.filters.keys()) self.assert_equal(app.jinja_env.filters['strrev'], my_reverse) self.assert_equal(app.jinja_env.filters['strrev']('abcd'), 'dcba') diff --git a/flask/testsuite/testing.py b/flask/testsuite/testing.py index 0cf1980d21..f665e12cd2 100644 --- a/flask/testsuite/testing.py +++ b/flask/testsuite/testing.py @@ -102,8 +102,8 @@ def other(): self.assert_equal(resp.status_code, 200) resp = c.get('/other') - assert not hasattr(flask.g, 'value') - assert 'Internal Server Error' in resp.data + self.assert_(not hasattr(flask.g, 'value')) + self.assert_('Internal Server Error' in resp.data) self.assert_equal(resp.status_code, 500) flask.g.value = 23