aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/tests/test_config.py
diff options
context:
space:
mode:
authorBrandon Invergo <brandon@invergo.net>2013-05-19 13:23:17 +0200
committerBrandon Invergo <brandon@invergo.net>2013-05-19 13:23:17 +0200
commite02b7b6b3bd6b20c65aeb2ca5fd1e0030b631b88 (patch)
tree988b9505a649f824f2ea53ac04bdfbc3a0da983a /mediagoblin/tests/test_config.py
parent60c42337ef7bc9b4aec0d3f1b2cb5f19a09d9a7f (diff)
parent041d2fd785f9b3e18f9fd758f91dbfa7715d317c (diff)
downloadmediagoblin-e02b7b6b3bd6b20c65aeb2ca5fd1e0030b631b88.tar.lz
mediagoblin-e02b7b6b3bd6b20c65aeb2ca5fd1e0030b631b88.tar.xz
mediagoblin-e02b7b6b3bd6b20c65aeb2ca5fd1e0030b631b88.zip
Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
Diffstat (limited to 'mediagoblin/tests/test_config.py')
-rw-r--r--mediagoblin/tests/test_config.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mediagoblin/tests/test_config.py b/mediagoblin/tests/test_config.py
index 7d8c65c1..b13adae6 100644
--- a/mediagoblin/tests/test_config.py
+++ b/mediagoblin/tests/test_config.py
@@ -36,7 +36,7 @@ def test_read_mediagoblin_config():
assert this_conf['carrotapp']['carrotcake'] == False
assert this_conf['carrotapp']['num_carrots'] == 1
- assert not this_conf['carrotapp'].has_key('encouragement_phrase')
+ assert 'encouragement_phrase' not in this_conf['carrotapp']
assert this_conf['celery']['EAT_CELERY_WITH_CARROTS'] == True
# A good file