cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject [13/16] git commit: updated refs/heads/master to 67b753c
Date Mon, 28 Dec 2015 10:22:37 GMT
Fix method call bugs when accessign non defined variables


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/acdc42cb
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/acdc42cb
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/acdc42cb

Branch: refs/heads/master
Commit: acdc42cb48f66e76f6337844f3409460da7631b1
Parents: f804c97
Author: Miguel Ferreira <miguelferreira@me.com>
Authored: Thu Dec 24 11:11:00 2015 +0100
Committer: nvazquez <nicovazquez90@gmail.com>
Committed: Thu Dec 24 16:07:06 2015 -0300

----------------------------------------------------------------------
 test/integration/plugins/test_nicira_controller.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/acdc42cb/test/integration/plugins/test_nicira_controller.py
----------------------------------------------------------------------
diff --git a/test/integration/plugins/test_nicira_controller.py b/test/integration/plugins/test_nicira_controller.py
index b41c0e6..fd83f2b 100644
--- a/test/integration/plugins/test_nicira_controller.py
+++ b/test/integration/plugins/test_nicira_controller.py
@@ -214,7 +214,7 @@ class TestNiciraContoller(cloudstackTestCase):
             if result_count == 0:
                 raise Exception('Nicira controller did not return any Transport Zones')
             elif result_count > 1:
-                self.logger.debug("Nicira controller returned %s Transport Zones, picking
first one" % resultCount)
+                cls.logger.debug("Nicira controller returned %s Transport Zones, picking
first one" % resultCount)
             transport_zone_api_url = list_transport_zone_response['results'][0]['_href']
             r3 = requests.get(
                 "https://%s%s" % (controller_host, transport_zone_api_url),
@@ -525,10 +525,10 @@ class TestNiciraContoller(cloudstackTestCase):
             result = str(ssh.execute(ssh_command))
             self.logger.debug("SSH result: %s; COUNT is ==> %s" % (result, result.count("3
packets received")))
         except Exception as e:
-            self.fail("SSH Access failed for %s: %s" % (vmObj.get_ip(), e))
+            self.fail("SSH Access failed for %s: %s" % (virtual_machine.get_ip(), e))
 
         self.assertEqual(result.count('3 packets received'), 1, 'Ping to outside world from
VM should be successful')
-		
+
     @attr(tags = ["advanced", "smoke", "nicira"], required_hardware="true")
     def test_04_nicira_shared_networks_numerical_vlanid(self):
         """


Mime
View raw message