Revision 75c3fc42 kamaki/clients/tests.py

b/kamaki/clients/tests.py
912 912
    def test_get_server_console(self):
913 913
        """Test get_server_console"""
914 914
        self.server2 = self._create_server(self.servname2,
915
            self.flavorid + 1,
915
            self.flavorid + 2,
916 916
            self.img)
917
        self._wait_for_status(self.server2['id'], 'BUILD')
917 918
        self._test_get_server_console()
918 919

  
919 920
    def _test_get_server_console(self):
920
        self._wait_for_status(self.server2['id'], 'BUILD')
921 921
        r = self.client.get_server_console(self.server2['id'])
922 922
        self.assertTrue('host' in r)
923 923
        self.assertTrue('password' in r)
......
1073 1073
        r = self.client.list_server_nics(self.server1['id'])
1074 1074
        len0 = len(r)
1075 1075
        self.assertTrue(len0 > 0)
1076
        print(' ' + net)
1076 1077
        self.assertTrue('1' in [net['network_id'] for net in r])
1077 1078

  
1078 1079
        self.client.connect_server(self.server1['id'], self.network2['id'])
......
2289 2290
        help="Show this help message and exit")
2290 2291
    return parser
2291 2292

  
2292
if __name__ == '__main__':
2293
    parser = init_parser()
2294
    args, argv = parser.parse_known_args()
2295 2293

  
2296
    if len(argv) > 2 or getattr(args, 'help') or len(argv) < 1:
2297
        raise Exception('\tusage: tests.py <group> [command]')
2298
    suiteFew = unittest.TestSuite()
2294
def main(argv):
2299 2295

  
2296
    suiteFew = unittest.TestSuite()
2300 2297
    if len(argv) == 0 or argv[0] == 'pithos':
2301 2298
        if len(argv) == 1:
2302 2299
            suiteFew.addTest(unittest.makeSuite(testPithos))
......
2320 2317
            suiteFew.addTest(testAstakos('test_' + argv[1]))
2321 2318

  
2322 2319
    unittest.TextTestRunner(verbosity=2).run(suiteFew)
2320

  
2321
if __name__ == '__main__':
2322
    parser = init_parser()
2323
    args, argv = parser.parse_known_args()
2324
    if len(argv) > 2 or getattr(args, 'help') or len(argv) < 1:
2325
        raise Exception('\tusage: tests.py <group> [command]')
2326
    main(argv)

Also available in: Unified diff