From fa9817778c83eb35b9c2c4332ccb7e5190d1ffa2 Mon Sep 17 00:00:00 2001 From: Aaron Kavlie Date: Mon, 14 Mar 2011 10:41:22 -0400 Subject: [PATCH] Test passes. Added test for silent flag; added import of errno so it passed. --- flask/config.py | 1 + tests/flask_tests.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/flask/config.py b/flask/config.py index 2b7499a4..250a8774 100644 --- a/flask/config.py +++ b/flask/config.py @@ -14,6 +14,7 @@ from __future__ import with_statement import imp import os import sys +import errno from werkzeug import import_string diff --git a/tests/flask_tests.py b/tests/flask_tests.py index 04b54777..42d4d3d0 100644 --- a/tests/flask_tests.py +++ b/tests/flask_tests.py @@ -1310,7 +1310,7 @@ class ConfigTestCase(unittest.TestCase): assert "'FOO_SETTINGS' is not set" in str(e) else: assert 0, 'expected exception' - not app.config.from_envvar('FOO_SETTINGS', silent=True) + assert not app.config.from_envvar('FOO_SETTINGS', silent=True) os.environ = {'FOO_SETTINGS': 'flask_tests.py'} assert app.config.from_envvar('FOO_SETTINGS') @@ -1329,6 +1329,7 @@ class ConfigTestCase(unittest.TestCase): assert msg.endswith("missing.cfg'") else: assert 0, 'expected config' + assert not app.config.from_pyfile('missing.cfg', silent=True) class SubdomainTestCase(unittest.TestCase):