From 23803b2845f4c784be18b0d4edfcb984df653df4 Mon Sep 17 00:00:00 2001 From: Stavros Sachtouris Date: Mon, 29 Oct 2012 14:47:46 +0200 Subject: [PATCH] Fix parse error in argument parsing --- kamaki/cli/argument.py | 4 ++-- kamaki/clients/tests.py | 17 +++++++++++++---- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/kamaki/cli/argument.py b/kamaki/cli/argument.py index fba139c..3a3a82f 100644 --- a/kamaki/cli/argument.py +++ b/kamaki/cli/argument.py @@ -188,13 +188,13 @@ class KeyValueArgument(ValueArgument): if keyvalue_pairs == self.default: return if isinstance(keyvalue_pairs, str): - keyvalue_pairs = keyvalue_pairs.trim().split(' ') + keyvalue_pairs = keyvalue_pairs.strip().split(' ') self._value = self.default for pair in keyvalue_pairs: key,sep,val = pair.partition('=') if not sep: raise CLISyntaxError(details='Missing "="" ( "key1=val1 key2=val2 ..."') - self._value[key.trim()] = val.trim() + self._value[key.strip()] = val.strip() _arguments = dict(config = _config_arg, help = Argument(0, 'Show help message', ('-h', '--help')), debug = FlagArgument('Include debug output', ('-d', '--debug')), diff --git a/kamaki/clients/tests.py b/kamaki/clients/tests.py index 6108615..a22c423 100644 --- a/kamaki/clients/tests.py +++ b/kamaki/clients/tests.py @@ -201,7 +201,6 @@ class testCyclades(unittest.TestCase): except ClientError as err: self.assertEqual(err.status, 421) r = self.client.get_network_details(netid) - print(r) time.sleep(wait) wait += 3 sys.stdout.write('.') @@ -239,8 +238,10 @@ class testCyclades(unittest.TestCase): self._test_list_servers() print('...ok') + print('- wait for test servers to build') self._wait_for_status(self.server1['id'], 'BUILD') self._wait_for_status(self.server2['id'], 'BUILD') + print('- ok') sys.stdout.write(' test get server details') self._test_get_server_details() @@ -259,8 +260,10 @@ class testCyclades(unittest.TestCase): self._test_reboot_server() print('...ok') + print('- wait for test servers to boot') self._wait_for_status(self.server1['id'], 'REBOOT') self._wait_for_status(self.server2['id'], 'REBOOT') + print('- ok') sys.stdout.write(' test create_server_metadata') self._test_create_server_metadata() @@ -328,6 +331,10 @@ class testCyclades(unittest.TestCase): self._test_create_network() print('...ok') + print('- wait for netowrk to be activated') + self._wait_for_network(self.network1['id'], 'ACTIVE') + print('- ok') + sys.stdout.write(' test connect_server') self._test_connect_server() print('...ok') @@ -337,6 +344,9 @@ class testCyclades(unittest.TestCase): print('...ok') self.network2 = self._create_network(self.netname2) + print('- wait for netowrk to be activated') + self._wait_for_network(self.network2['id'], 'ACTIVE') + print('- ok') sys.stdout.write(' test list_server_nics') self._test_list_server_nics() @@ -379,7 +389,7 @@ class testCyclades(unittest.TestCase): if r['status'] == status: print('\tOK') return True - print('\tit is now %s, wait %ss '%(r['status'], wait)) + sys.stdout.write('\tit is now %s, wait %ss '%(r['status'], wait)) for i in range(wait*4): sys.stdout.write('\b%s'%c[i%4]) sys.stdout.flush() @@ -389,6 +399,7 @@ class testCyclades(unittest.TestCase): return False def _wait_for_nic(self, netid, servid, in_creation=True): + self._wait_for_network(netid, 'ACTIVE') c=['|','/','-','\\'] limit = 50 wait=3 @@ -798,11 +809,9 @@ class testCyclades(unittest.TestCase): r = self.client.list_server_nics(self.server1['id']) len0 = len(r) self.assertTrue(len0>0) - print(r) self.assertTrue('1' in [net['network_id'] for net in r]) self.client.connect_server(self.server1['id'], self.network2['id']) - print('self.network2[id] %s'%self.network2) self.assertTrue(self._wait_for_nic(self.network2['id'], self.server1['id'])) r = self.client.list_server_nics(self.server1['id']) self.assertTrue(len(r)>len0) -- 1.7.10.4