launchpad-reviewers team mailing list archive

["Jeroen T. Vermeulen" <jtv@xxxxxxxxxxxxx>]

Jeroen T. Vermeulen has proposed merging lp:~jtv/maas/migrate-config-tests into lp:maas.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~jtv/maas/migrate-config-tests/+merge/105436

As per the models-migration plan.  Pretty straightforward, although I did get weird and unexpected test failures at first as I used the maastesting version of TestCase, rather than the maasserver one.


Jeroen
-- 
https://code.launchpad.net/~jtv/maas/migrate-config-tests/+merge/105436
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~jtv/maas/migrate-config-tests into lp:maas.

=== added file 'src/maasserver/tests/test_config.py'
--- src/maasserver/tests/test_config.py	1970-01-01 00:00:00 +0000
+++ src/maasserver/tests/test_config.py	2012-05-11 05:05:23 +0000
@@ -0,0 +1,134 @@
+# Copyright 2012 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Tests for the `Config` class and friends."""
+
+from __future__ import (
+    absolute_import,
+    print_function,
+    unicode_literals,
+    )
+
+__metaclass__ = type
+__all__ = []
+
+from socket import gethostname
+
+from fixtures import TestWithFixtures
+from maasserver.models import Config
+from maasserver.models.config import (
+    DEFAULT_CONFIG,
+    get_default_config,
+    )
+from maasserver.testing.factory import factory
+from maasserver.testing.testcase import TestCase
+
+
+class ConfigDefaultTest(TestCase, TestWithFixtures):
+    """Test config default values."""
+
+    def test_default_config_maas_name(self):
+        default_config = get_default_config()
+        self.assertEqual(gethostname(), default_config['maas_name'])
+
+
+class Listener:
+    """A utility class which tracks the calls to its 'call' method and
+    stores the arguments given to 'call' in 'self.calls'.
+    """
+
+    def __init__(self):
+        self.calls = []
+
+    def call(self, *args, **kwargs):
+        self.calls.append([args, kwargs])
+
+
+class ConfigTest(TestCase):
+    """Testing of the :class:`Config` model and its related manager class."""
+
+    def test_manager_get_config_found(self):
+        Config.objects.create(name='name', value='config')
+        config = Config.objects.get_config('name')
+        self.assertEqual('config', config)
+
+    def test_manager_get_config_not_found(self):
+        config = Config.objects.get_config('name', 'default value')
+        self.assertEqual('default value', config)
+
+    def test_manager_get_config_not_found_none(self):
+        config = Config.objects.get_config('name')
+        self.assertIsNone(config)
+
+    def test_manager_get_config_not_found_in_default_config(self):
+        name = factory.getRandomString()
+        value = factory.getRandomString()
+        DEFAULT_CONFIG[name] = value
+        config = Config.objects.get_config(name, None)
+        self.assertEqual(value, config)
+
+    def test_default_config_cannot_be_changed(self):
+        name = factory.getRandomString()
+        DEFAULT_CONFIG[name] = {'key': 'value'}
+        config = Config.objects.get_config(name)
+        config.update({'key2': 'value2'})
+
+        self.assertEqual({'key': 'value'}, Config.objects.get_config(name))
+
+    def test_manager_get_config_list_returns_config_list(self):
+        Config.objects.create(name='name', value='config1')
+        Config.objects.create(name='name', value='config2')
+        config_list = Config.objects.get_config_list('name')
+        self.assertItemsEqual(['config1', 'config2'], config_list)
+
+    def test_manager_set_config_creates_config(self):
+        Config.objects.set_config('name', 'config1')
+        Config.objects.set_config('name', 'config2')
+        self.assertSequenceEqual(
+            ['config2'],
+            [config.value for config in Config.objects.filter(name='name')])
+
+    def test_manager_config_changed_connect_connects(self):
+        listener = Listener()
+        name = factory.getRandomString()
+        value = factory.getRandomString()
+        Config.objects.config_changed_connect(name, listener.call)
+        Config.objects.set_config(name, value)
+        config = Config.objects.get(name=name)
+
+        self.assertEqual(1, len(listener.calls))
+        self.assertEqual((Config, config, True), listener.calls[0][0])
+
+    def test_manager_config_changed_connect_connects_multiple(self):
+        listener = Listener()
+        listener2 = Listener()
+        name = factory.getRandomString()
+        value = factory.getRandomString()
+        Config.objects.config_changed_connect(name, listener.call)
+        Config.objects.config_changed_connect(name, listener2.call)
+        Config.objects.set_config(name, value)
+
+        self.assertEqual(1, len(listener.calls))
+        self.assertEqual(1, len(listener2.calls))
+
+    def test_manager_config_changed_connect_connects_multiple_same(self):
+        # If the same method is connected twice, it will only get called
+        # once.
+        listener = Listener()
+        name = factory.getRandomString()
+        value = factory.getRandomString()
+        Config.objects.config_changed_connect(name, listener.call)
+        Config.objects.config_changed_connect(name, listener.call)
+        Config.objects.set_config(name, value)
+
+        self.assertEqual(1, len(listener.calls))
+
+    def test_manager_config_changed_connect_connects_by_config_name(self):
+        listener = Listener()
+        name = factory.getRandomString()
+        value = factory.getRandomString()
+        Config.objects.config_changed_connect(name, listener.call)
+        another_name = factory.getRandomString()
+        Config.objects.set_config(another_name, value)
+
+        self.assertEqual(0, len(listener.calls))

=== modified file 'src/maasserver/tests/test_models.py'
--- src/maasserver/tests/test_models.py	2012-05-05 09:47:03 +0000
+++ src/maasserver/tests/test_models.py	2012-05-11 05:05:23 +0000
@@ -18,7 +18,6 @@
 import os
 import random
 import shutil
-from socket import gethostname
 
 from django.conf import settings
 from django.contrib.auth.models import User
@@ -31,7 +30,6 @@
     transaction,
     )
 from django.utils.safestring import SafeUnicode
-from fixtures import TestWithFixtures
 from maasserver.enum import (
     NODE_PERMISSION,
     NODE_STATUS,
@@ -60,10 +58,6 @@
     UserProfile,
     validate_ssh_public_key,
     )
-from maasserver.models.config import (
-    DEFAULT_CONFIG,
-    get_default_config,
-    )
 from maasserver.provisioning import get_provisioning_api_proxy
 from maasserver.testing import get_data
 from maasserver.testing.factory import factory
@@ -1347,116 +1341,3 @@
         FileStorage.objects.collect_garbage()
         # ...we get through garbage collection without breakage.
         pass
-
-
-# Due for model migration on 2012-05-11
-class ConfigDefaultTest(TestCase, TestWithFixtures):
-    """Test config default values."""
-
-    def test_default_config_maas_name(self):
-        default_config = get_default_config()
-        self.assertEqual(gethostname(), default_config['maas_name'])
-
-
-# Due for model migration on 2012-05-11
-class Listener:
-    """A utility class which tracks the calls to its 'call' method and
-    stores the arguments given to 'call' in 'self.calls'.
-    """
-
-    def __init__(self):
-        self.calls = []
-
-    def call(self, *args, **kwargs):
-        self.calls.append([args, kwargs])
-
-
-# Due for model migration on 2012-05-11
-class ConfigTest(TestCase):
-    """Testing of the :class:`Config` model and its related manager class."""
-
-    def test_manager_get_config_found(self):
-        Config.objects.create(name='name', value='config')
-        config = Config.objects.get_config('name')
-        self.assertEqual('config', config)
-
-    def test_manager_get_config_not_found(self):
-        config = Config.objects.get_config('name', 'default value')
-        self.assertEqual('default value', config)
-
-    def test_manager_get_config_not_found_none(self):
-        config = Config.objects.get_config('name')
-        self.assertIsNone(config)
-
-    def test_manager_get_config_not_found_in_default_config(self):
-        name = factory.getRandomString()
-        value = factory.getRandomString()
-        DEFAULT_CONFIG[name] = value
-        config = Config.objects.get_config(name, None)
-        self.assertEqual(value, config)
-
-    def test_default_config_cannot_be_changed(self):
-        name = factory.getRandomString()
-        DEFAULT_CONFIG[name] = {'key': 'value'}
-        config = Config.objects.get_config(name)
-        config.update({'key2': 'value2'})
-
-        self.assertEqual({'key': 'value'}, Config.objects.get_config(name))
-
-    def test_manager_get_config_list_returns_config_list(self):
-        Config.objects.create(name='name', value='config1')
-        Config.objects.create(name='name', value='config2')
-        config_list = Config.objects.get_config_list('name')
-        self.assertItemsEqual(['config1', 'config2'], config_list)
-
-    def test_manager_set_config_creates_config(self):
-        Config.objects.set_config('name', 'config1')
-        Config.objects.set_config('name', 'config2')
-        self.assertSequenceEqual(
-            ['config2'],
-            [config.value for config in Config.objects.filter(name='name')])
-
-    def test_manager_config_changed_connect_connects(self):
-        listener = Listener()
-        name = factory.getRandomString()
-        value = factory.getRandomString()
-        Config.objects.config_changed_connect(name, listener.call)
-        Config.objects.set_config(name, value)
-        config = Config.objects.get(name=name)
-
-        self.assertEqual(1, len(listener.calls))
-        self.assertEqual((Config, config, True), listener.calls[0][0])
-
-    def test_manager_config_changed_connect_connects_multiple(self):
-        listener = Listener()
-        listener2 = Listener()
-        name = factory.getRandomString()
-        value = factory.getRandomString()
-        Config.objects.config_changed_connect(name, listener.call)
-        Config.objects.config_changed_connect(name, listener2.call)
-        Config.objects.set_config(name, value)
-
-        self.assertEqual(1, len(listener.calls))
-        self.assertEqual(1, len(listener2.calls))
-
-    def test_manager_config_changed_connect_connects_multiple_same(self):
-        # If the same method is connected twice, it will only get called
-        # once.
-        listener = Listener()
-        name = factory.getRandomString()
-        value = factory.getRandomString()
-        Config.objects.config_changed_connect(name, listener.call)
-        Config.objects.config_changed_connect(name, listener.call)
-        Config.objects.set_config(name, value)
-
-        self.assertEqual(1, len(listener.calls))
-
-    def test_manager_config_changed_connect_connects_by_config_name(self):
-        listener = Listener()
-        name = factory.getRandomString()
-        value = factory.getRandomString()
-        Config.objects.config_changed_connect(name, listener.call)
-        another_name = factory.getRandomString()
-        Config.objects.set_config(another_name, value)
-
-        self.assertEqual(0, len(listener.calls))