Group all colon_separated_user_group tests together

supervisor/tests/test_datatypes.py

@@ -247,33 +247,6 @@ class DatatypesTest(unittest.TestCase):
     def test_name_to_gid_raises_for_bad_group_name(self):
         self.assertRaises(ValueError, datatypes.name_to_gid, "42")
 
-    def test_colon_separated_user_group_returns_both(self):
-        name_to_uid = Mock(return_value=12)
-        name_to_gid = Mock(return_value=34)
-
-        @patch("supervisor.datatypes.name_to_uid", name_to_uid)
-        @patch("supervisor.datatypes.name_to_gid", name_to_gid)
-        def colon_separated():
-            return datatypes.colon_separated_user_group("foo:bar")
-
-        uid, gid = colon_separated()
-        name_to_uid.assert_called_with("foo")
-        self.assertEquals(12, uid)
-        name_to_gid.assert_called_with("bar")
-        self.assertEquals(34, gid)
-
-    def test_colon_separated_user_group_returns_user_only(self):
-        name_to_uid = Mock(return_value=42)
-
-        @patch("supervisor.datatypes.name_to_uid", name_to_uid)
-        def colon_separated():
-            return datatypes.colon_separated_user_group("foo")
-
-        uid, gid = colon_separated()
-        name_to_uid.assert_called_with("foo")
-        self.assertEquals(42, uid)
-        self.assertEquals(-1, gid)
-
 class InetStreamSocketConfigTests(unittest.TestCase):
     def _getTargetClass(self):
         return datatypes.InetStreamSocketConfig
@@ -491,6 +464,33 @@ class TestColonSeparatedUserGroup(unittest.TestCase):
         self.assertRaises(ValueError,
                           self._callFUT, 'godihopethisuserdoesntexist:foo')
 
+    def test_separated_user_group_returns_both(self):
+        name_to_uid = Mock(return_value=12)
+        name_to_gid = Mock(return_value=34)
+
+        @patch("supervisor.datatypes.name_to_uid", name_to_uid)
+        @patch("supervisor.datatypes.name_to_gid", name_to_gid)
+        def colon_separated(value):
+            return self._callFUT(value)
+
+        uid, gid = colon_separated("foo:bar")
+        name_to_uid.assert_called_with("foo")
+        self.assertEquals(12, uid)
+        name_to_gid.assert_called_with("bar")
+        self.assertEquals(34, gid)
+
+    def test_separated_user_group_returns_user_only(self):
+        name_to_uid = Mock(return_value=42)
+
+        @patch("supervisor.datatypes.name_to_uid", name_to_uid)
+        def colon_separated(value):
+            return self._callFUT(value)
+
+        uid, gid = colon_separated("foo")
+        name_to_uid.assert_called_with("foo")
+        self.assertEquals(42, uid)
+        self.assertEquals(-1, gid)
+
 class TestOctalType(unittest.TestCase):
     def _callFUT(self, arg):
         from supervisor.datatypes import octal_type