Hide the GroupAttr conf and group attributes

There's no reason why an option group shouldn't have options called
'group' or 'conf'.

Add a test case which would have failed because the 'conf' attribute
would have been a ConfigOpts instance and fix it by making those
attributes private.

Change-Id: Ic3e41a546c0d1b7b6aae04e1dbac2933ac661f57

1 files changed, 12 insertions, 0 deletions

diff --git a/tests/unit/test_cfg.py b/tests/unit/test_cfg.py
index 384a57a..4bfc37a 100644
--- a/tests/unit/test_cfg.py
+++ b/tests/unit/test_cfg.py
@@ -735,6 +735,18 @@ class OptGroupsTestCase(BaseTestCase):
         self.assertTrue(hasattr(self.conf.blaa, 'foo'))
         self.assertEquals(self.conf.blaa.foo, 'bar')
 
+    def test_arg_group_with_conf_and_group_opts(self):
+        self.conf.register_cli_opt(StrOpt('conf'), group='blaa')
+        self.conf.register_cli_opt(StrOpt('group'), group='blaa')
+
+        self.conf(['--blaa-conf', 'foo', '--blaa-group', 'bar'])
+
+        self.assertTrue(hasattr(self.conf, 'blaa'))
+        self.assertTrue(hasattr(self.conf.blaa, 'conf'))
+        self.assertEquals(self.conf.blaa.conf, 'foo')
+        self.assertTrue(hasattr(self.conf.blaa, 'group'))
+        self.assertEquals(self.conf.blaa.group, 'bar')
+
     def test_arg_group_in_config_file(self):
         self.conf.register_group(OptGroup('blaa'))
         self.conf.register_opt(StrOpt('foo'), group='blaa')