Permalink
Browse files

Fixed an error reporting bug with flask.Config.from_envvar

  • Loading branch information...
1 parent 6913dc1 commit 6cb0855e2dd181df5353fc1be9b437c7bc92eb2f @mitsuhiko mitsuhiko committed May 28, 2010
Showing with 29 additions and 1 deletion.
  1. +7 −0 CHANGES
  2. +2 −1 flask.py
  3. +20 −0 tests/flask_tests.py
View
@@ -8,6 +8,13 @@ Version 0.4
Release date to be announced, codename to be selected.
+Version 0.3.1
+-------------
+
+Bugfix release, released May 28th
+
+- fixed a error reporting bug with :meth:`flask.Config.from_envvar`
+
Version 0.3
-----------
View
@@ -698,7 +698,8 @@ def from_envvar(self, variable_name, silent=False):
raise RuntimeError('The environment variable %r is not set '
'and as such configuration could not be '
'loaded. Set this variable and make it '
- 'point to a configuration file')
+ 'point to a configuration file' %
+ variable_name)
self.from_pyfile(rv)
return True
View
@@ -717,6 +717,26 @@ class Test(Base):
app.config.from_object(Test)
self.common_object_test(app)
+ def test_config_from_envvar(self):
+ import os
+ env = os.environ
+ try:
+ os.environ = {}
+ app = flask.Flask(__name__)
+ try:
+ app.config.from_envvar('FOO_SETTINGS')
+ except RuntimeError, e:
+ assert "'FOO_SETTINGS' is not set" in str(e)
+ else:
+ assert 0, 'expected exception'
+ not app.config.from_envvar('FOO_SETTINGS', silent=True)
+
+ os.environ = {'FOO_SETTINGS': 'flask_tests.py'}
+ assert app.config.from_envvar('FOO_SETTINGS')
+ self.common_object_test(app)
+ finally:
+ os.environ = env
+
def suite():
from minitwit_tests import MiniTwitTestCase

0 comments on commit 6cb0855

Please sign in to comment.