On 27.02.2013 [22:52:19 -0300], Lucas Meneghel Rodrigues wrote: > On 02/27/2013 05:54 PM, Lucas Meneghel Rodrigues wrote: > >Great, looks good. > > Looks good, but the unittests will have to be adapted:
This at least makes things pass, but I think I need to still add some tests that actual test that the username being passed in works. I would appreciate any help with that. cli: allow username to be passed in This is necessary for authentication schemes on the backend (LDAP, etc.). Signed-off-by: Nishanth Aravamudan <[email protected]> diff --git a/cli/topic_common.py b/cli/topic_common.py index dc057bf..55597eb 100644 --- a/cli/topic_common.py +++ b/cli/topic_common.py @@ -361,6 +361,7 @@ class atest(object): self.kill_on_failure = False self.web_server = '' self.verbose = False + self.username = '' self.topic_parse_info = item_parse_info(attribute_name='not_used') self.parser = optparse.OptionParser(self._get_usage()) @@ -384,6 +385,11 @@ class atest(object): 'to talk to', action='store', type='string', dest='web_server', default=None) + self.parser.add_option('-N', '--username', + help='Specify the username to' + 'login with', + action='store', type='string', + dest='username', default=None) def _get_usage(self): @@ -454,7 +460,7 @@ class atest(object): self.verbose = options.verbose self.web_server = options.web_server try: - self.afe = rpc.afe_comm(self.web_server) + self.afe = rpc.afe_comm(self.web_server, username=self.username) except rpc.AuthError, s: self.failure(str(s), fatal=True) diff --git a/cli/topic_common_unittest.py b/cli/topic_common_unittest.py index f16691f..c8f1f88 100755 --- a/cli/topic_common_unittest.py +++ b/cli/topic_common_unittest.py @@ -466,7 +466,8 @@ class atest_unittest(cli_mock.cli_unittest): self.assertEqualNoOrder(self.atest.hosts, ['left1', 'left2', 'host1', 'host2']) - self.assertEqual({'mlist': flist.name, + self.assertEqual({'username': None, + 'mlist': flist.name, 'web_server': 'fooweb', 'parse': True, 'parse_delim': '|', @@ -488,7 +489,8 @@ class atest_unittest(cli_mock.cli_unittest): self.assertEqualNoOrder(self.atest.hosts, ['left2', 'host1', 'host2']) - self.assertEqual({'mlist': flist.name, + self.assertEqual({'username': None, + 'mlist': flist.name, 'web_server': 'fooweb', 'parse': True, 'parse_delim': '|', @@ -522,7 +524,8 @@ class atest_unittest(cli_mock.cli_unittest): ['user1', 'user2', 'user3', 'myuser', 'youruser']) - self.assertEqual({'mlist': flist.name, + self.assertEqual({'username': None, + 'mlist': flist.name, 'ulist': ulist.name, 'user': 'myuser,youruser', 'web_server': None, @@ -559,7 +562,8 @@ class atest_unittest(cli_mock.cli_unittest): ['user1', 'user2', 'user3', 'myuser', 'youruser']) - self.assertEqual({'mlist': flist.name, + self.assertEqual({'username': None, + 'mlist': flist.name, 'ulist': ulist.name, 'user': 'myuser,youruser', 'web_server': None, @@ -595,7 +599,8 @@ class atest_unittest(cli_mock.cli_unittest): ['user1', 'user2', 'user3', 'myuser', 'youruser']) - self.assertEqual({'mlist': flist.name, + self.assertEqual({'username': None, + 'mlist': flist.name, 'ulist': ulist.name, 'user': 'myuser,youruser', 'web_server': None, @@ -629,7 +634,8 @@ class atest_unittest(cli_mock.cli_unittest): self.assertEqualNoOrder(self.atest.users, ['user1', 'user2', 'user3']) - self.assertEqual({'mlist': flist.name, + self.assertEqual({'username': None, + 'mlist': flist.name, 'ulist': ulist.name, 'user': None, 'web_server': None, @@ -659,7 +665,8 @@ class atest_unittest(cli_mock.cli_unittest): self.assertEqualNoOrder(self.atest.users, ['myuser', 'youruser']) - self.assertEqual({'mlist': None, + self.assertEqual({'username': None, + 'mlist': None, 'ulist': None, 'user': 'myuser,youruser', 'web_server': None, @@ -686,7 +693,8 @@ class atest_unittest(cli_mock.cli_unittest): self.assertEqualNoOrder(self.atest.users, ['myuser', 'youruser']) - self.assertEqual({'user': 'myuser,youruser', + self.assertEqual({'username': None, + 'user': 'myuser,youruser', 'acl': 'acl1,acl2', 'web_server': None, 'parse': False, @@ -707,7 +715,8 @@ class atest_unittest(cli_mock.cli_unittest): self.assertEqualNoOrder(self.atest.users, ['myuser', 'youruser']) - self.assertEqual({'user': 'myuser,youruser', + self.assertEqual({'username': None, + 'user': 'myuser,youruser', 'web_server': None, 'parse': False, 'parse_delim': '|', @@ -751,7 +760,8 @@ class atest_unittest(cli_mock.cli_unittest): '--kill-on-failure', '--verbose', 'left1', 'left2', '--parse-delim', '?'] (options, leftover) = self.atest.parse() - self.assertEqual({'web_server': 'fooweb', + self.assertEqual({'username': None, + 'web_server': 'fooweb', 'parse': True, 'parse_delim': '?', 'kill_on_failure': True, _______________________________________________ Autotest-kernel mailing list [email protected] https://www.redhat.com/mailman/listinfo/autotest-kernel
