summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurence Rowe <laurence@lrowe.co.uk>2014-12-05 19:03:17 -0800
committerLaurence Rowe <laurence@lrowe.co.uk>2014-12-05 19:03:17 -0800
commiteeeb0167accbb26e6205a74846f93e82561d1d1d (patch)
tree547410e6e1895ccb1355283e257941c338ec375a
parent3b2c321b6909ebea80c241195766725b09ff5063 (diff)
downloadpastedeploy-eeeb0167accbb26e6205a74846f93e82561d1d1d.tar.gz
Update tests to reflect new behaviour of globals and DEFAULTlrowe/allow-global_conf-to-override-defaults-s-1417659209217
-rw-r--r--tests/test_config.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/test_config.py b/tests/test_config.py
index de40a2a..f64dd21 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -98,7 +98,8 @@ def test_foreign_config():
'bob': 'your uncle'})
eq_(app.global_conf, {
'def1': 'a',
- 'def2': 'from include',
+ # Note overwrite of DEFAULT value from foreign config
+ 'def2': 'b',
'def3': 'c',
'basepath': config_path,
'glob': 'override',
@@ -150,8 +151,8 @@ def test_global_conf():
global_conf={'def2': 'TEST DEF 2', 'inherit': 'bazbar'})
eq_(conf, {
'def1': 'a',
- # Note that this gets overwritten:
- 'def2': 'b',
+ # Note overwrite of DEFAULT value
+ 'def2': 'TEST DEF 2',
'basepath': os.path.join(here, 'sample_configs'),
'here': config_path,
'inherit': 'bazbar',