summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-09-01 00:44:15 -0400
committerChris McDonough <chrism@plope.com>2011-09-01 00:44:15 -0400
commit2075f86ed94804932873f2ad0bd464a28cb305a9 (patch)
tree6fd595cf27cbe2ecd5e77d6213a65400ecb38a53
parent6251e00ef4c4e6e1979ec1b52a593e30430cf656 (diff)
downloadpyramid-2075f86ed94804932873f2ad0bd464a28cb305a9.tar.gz
pyramid-2075f86ed94804932873f2ad0bd464a28cb305a9.tar.bz2
pyramid-2075f86ed94804932873f2ad0bd464a28cb305a9.zip
move settings getter/setter tests to test_settings
-rw-r--r--pyramid/tests/test_config/test_init.py10
-rw-r--r--pyramid/tests/test_config/test_settings.py10
2 files changed, 10 insertions, 10 deletions
diff --git a/pyramid/tests/test_config/test_init.py b/pyramid/tests/test_config/test_init.py
index 46cb0f0a1..3d2a0f38a 100644
--- a/pyramid/tests/test_config/test_init.py
+++ b/pyramid/tests/test_config/test_init.py
@@ -72,16 +72,6 @@ class ConfiguratorTests(unittest.TestCase):
self.assertTrue(config.registry.getUtility(IRendererFactory, '.mak'))
self.assertTrue(config.registry.getUtility(IRendererFactory, '.mako'))
- def test__set_settings_as_None(self):
- config = self._makeOne()
- settings = config._set_settings(None)
- self.assertTrue(settings)
-
- def test__set_settings_as_dictwithvalues(self):
- config = self._makeOne()
- settings = config._set_settings({'a':'1'})
- self.assertEqual(settings['a'], '1')
-
def test_begin(self):
from pyramid.config import Configurator
config = Configurator()
diff --git a/pyramid/tests/test_config/test_settings.py b/pyramid/tests/test_config/test_settings.py
index b2e516b4c..8a385b8ab 100644
--- a/pyramid/tests/test_config/test_settings.py
+++ b/pyramid/tests/test_config/test_settings.py
@@ -6,6 +6,16 @@ class TestSettingsConfiguratorMixin(unittest.TestCase):
config = Configurator(*arg, **kw)
return config
+ def test__set_settings_as_None(self):
+ config = self._makeOne()
+ settings = config._set_settings(None)
+ self.assertTrue(settings)
+
+ def test__set_settings_as_dictwithvalues(self):
+ config = self._makeOne()
+ settings = config._set_settings({'a':'1'})
+ self.assertEqual(settings['a'], '1')
+
def test_get_settings_nosettings(self):
from pyramid.registry import Registry
reg = Registry()