launchpad-reviewers team mailing list archive

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

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

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

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

As per the migration plan, the code you see removed/added here really only moves from one file to another unchanged.  The only other changes are the removal of the migration announcement and the expected top-of-file boilerplate.

This is scheduled to land on June 28.


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

=== modified file 'src/metadataserver/tests/test_models.py'
--- src/metadataserver/tests/test_models.py	2012-06-20 17:52:40 +0000
+++ src/metadataserver/tests/test_models.py	2012-06-27 03:17:20 +0000
@@ -19,7 +19,6 @@
 from metadataserver.models import (
     NodeCommissionResult,
     NodeKey,
-    NodeUserData,
     )
 
 
@@ -72,72 +71,6 @@
                 NodeKey.objects.get_node_for_key(key)).key)
 
 
-# Scheduled for model migration on 2012-06-28
-class TestNodeUserDataManager(DjangoTestCase):
-    """Test NodeUserDataManager."""
-
-    def setUp(self):
-        super(TestNodeUserDataManager, self).setUp()
-
-    def test_set_user_data_creates_new_nodeuserdata_if_needed(self):
-        node = factory.make_node()
-        data = b'foo'
-        NodeUserData.objects.set_user_data(node, data)
-        self.assertEqual(data, NodeUserData.objects.get(node=node).data)
-
-    def test_set_user_data_overwrites_existing_userdata(self):
-        node = factory.make_node()
-        data = b'bar'
-        NodeUserData.objects.set_user_data(node, b'old data')
-        NodeUserData.objects.set_user_data(node, data)
-        self.assertEqual(data, NodeUserData.objects.get(node=node).data)
-
-    def test_set_user_data_leaves_data_for_other_nodes_alone(self):
-        node = factory.make_node()
-        NodeUserData.objects.set_user_data(node, b'intact')
-        NodeUserData.objects.set_user_data(factory.make_node(), b'unrelated')
-        self.assertEqual(b'intact', NodeUserData.objects.get(node=node).data)
-
-    def test_set_user_data_to_None_removes_user_data(self):
-        node = factory.make_node()
-        NodeUserData.objects.set_user_data(node, b'original')
-        NodeUserData.objects.set_user_data(node, None)
-        self.assertItemsEqual([], NodeUserData.objects.filter(node=node))
-
-    def test_set_user_data_to_None_when_none_exists_does_nothing(self):
-        node = factory.make_node()
-        NodeUserData.objects.set_user_data(node, None)
-        self.assertItemsEqual([], NodeUserData.objects.filter(node=node))
-
-    def test_get_user_data_retrieves_data(self):
-        node = factory.make_node()
-        data = b'splat'
-        NodeUserData.objects.set_user_data(node, data)
-        self.assertEqual(data, NodeUserData.objects.get_user_data(node))
-
-    def test_get_user_data_raises_DoesNotExist_if_not_found(self):
-        node = factory.make_node()
-        self.assertRaises(
-            NodeUserData.DoesNotExist,
-            NodeUserData.objects.get_user_data, node)
-
-    def test_get_user_data_ignores_other_nodes(self):
-        node = factory.make_node()
-        data = b'bzzz'
-        NodeUserData.objects.set_user_data(node, data)
-        NodeUserData.objects.set_user_data(factory.make_node(), b'unrelated')
-        self.assertEqual(data, NodeUserData.objects.get_user_data(node))
-
-    def test_has_user_data_returns_False_if_node_has_no_user_data(self):
-        self.assertFalse(
-            NodeUserData.objects.has_user_data(factory.make_node()))
-
-    def test_has_user_data_returns_True_if_node_has_user_data(self):
-        node = factory.make_node()
-        NodeUserData.objects.set_user_data(node, b"This node has user data.")
-        self.assertTrue(NodeUserData.objects.has_user_data(node))
-
-
 class TestNodeCommissionResult(DjangoTestCase):
     """Test the NodeCommissionResult model."""
 

=== added file 'src/metadataserver/tests/test_nodeuserdata.py'
--- src/metadataserver/tests/test_nodeuserdata.py	1970-01-01 00:00:00 +0000
+++ src/metadataserver/tests/test_nodeuserdata.py	2012-06-27 03:17:20 +0000
@@ -0,0 +1,82 @@
+# Copyright 2012 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Tests for :class:`NodeUserData` and manager."""
+
+from __future__ import (
+    absolute_import,
+    print_function,
+    unicode_literals,
+    )
+
+__metaclass__ = type
+__all__ = []
+
+from maasserver.testing.factory import factory
+from maastesting.djangotestcase import DjangoTestCase
+from metadataserver.models import NodeUserData
+
+
+class TestNodeUserDataManager(DjangoTestCase):
+    """Test NodeUserDataManager."""
+
+    def setUp(self):
+        super(TestNodeUserDataManager, self).setUp()
+
+    def test_set_user_data_creates_new_nodeuserdata_if_needed(self):
+        node = factory.make_node()
+        data = b'foo'
+        NodeUserData.objects.set_user_data(node, data)
+        self.assertEqual(data, NodeUserData.objects.get(node=node).data)
+
+    def test_set_user_data_overwrites_existing_userdata(self):
+        node = factory.make_node()
+        data = b'bar'
+        NodeUserData.objects.set_user_data(node, b'old data')
+        NodeUserData.objects.set_user_data(node, data)
+        self.assertEqual(data, NodeUserData.objects.get(node=node).data)
+
+    def test_set_user_data_leaves_data_for_other_nodes_alone(self):
+        node = factory.make_node()
+        NodeUserData.objects.set_user_data(node, b'intact')
+        NodeUserData.objects.set_user_data(factory.make_node(), b'unrelated')
+        self.assertEqual(b'intact', NodeUserData.objects.get(node=node).data)
+
+    def test_set_user_data_to_None_removes_user_data(self):
+        node = factory.make_node()
+        NodeUserData.objects.set_user_data(node, b'original')
+        NodeUserData.objects.set_user_data(node, None)
+        self.assertItemsEqual([], NodeUserData.objects.filter(node=node))
+
+    def test_set_user_data_to_None_when_none_exists_does_nothing(self):
+        node = factory.make_node()
+        NodeUserData.objects.set_user_data(node, None)
+        self.assertItemsEqual([], NodeUserData.objects.filter(node=node))
+
+    def test_get_user_data_retrieves_data(self):
+        node = factory.make_node()
+        data = b'splat'
+        NodeUserData.objects.set_user_data(node, data)
+        self.assertEqual(data, NodeUserData.objects.get_user_data(node))
+
+    def test_get_user_data_raises_DoesNotExist_if_not_found(self):
+        node = factory.make_node()
+        self.assertRaises(
+            NodeUserData.DoesNotExist,
+            NodeUserData.objects.get_user_data, node)
+
+    def test_get_user_data_ignores_other_nodes(self):
+        node = factory.make_node()
+        data = b'bzzz'
+        NodeUserData.objects.set_user_data(node, data)
+        NodeUserData.objects.set_user_data(factory.make_node(), b'unrelated')
+        self.assertEqual(data, NodeUserData.objects.get_user_data(node))
+
+    def test_has_user_data_returns_False_if_node_has_no_user_data(self):
+        self.assertFalse(
+            NodeUserData.objects.has_user_data(factory.make_node()))
+
+    def test_has_user_data_returns_True_if_node_has_user_data(self):
+        node = factory.make_node()
+        NodeUserData.objects.set_user_data(node, b"This node has user data.")
+        self.assertTrue(NodeUserData.objects.has_user_data(node))