Updated Branches: refs/heads/4.2 45fca6a83 -> a9d8333c5
Fix missing key Signed-off-by: Prasanna Santhanam <t...@apache.org> (cherry picked from commit d1c01a79a5d75fdc184e385d23c59b6fd283d894) Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a9d8333c Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a9d8333c Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a9d8333c Branch: refs/heads/4.2 Commit: a9d8333c55633284db656df6ddb638d26b80a829 Parents: 45fca6a Author: Prasanna Santhanam <t...@apache.org> Authored: Wed Aug 7 22:52:45 2013 +0530 Committer: Prasanna Santhanam <t...@apache.org> Committed: Wed Aug 7 22:52:55 2013 +0530 ---------------------------------------------------------------------- test/integration/component/test_snapshot_gc.py | 4 ++-- test/integration/component/test_snapshot_limits.py | 4 ++-- test/integration/component/test_snapshots.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a9d8333c/test/integration/component/test_snapshot_gc.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_snapshot_gc.py b/test/integration/component/test_snapshot_gc.py index 7727d1c..ca99afa 100644 --- a/test/integration/component/test_snapshot_gc.py +++ b/test/integration/component/test_snapshot_gc.py @@ -282,7 +282,7 @@ class TestAccountSnapshotClean(cloudstackTestCase): ssh_client.execute(c) except Exception as e: self.fail("SSH failed for management server: %s - %s" % - (self.services["mgmt_server"]["ipaddress"], e)) + (self.config.mgtSvr[0].mgtSvrIp, e)) res = str(snapshots) return res.count(snapshot_id) == 1 @@ -401,4 +401,4 @@ class TestAccountSnapshotClean(cloudstackTestCase): ) self.assertFalse(self.is_snapshot_on_nfs(snapshot_id), "Snapshot was still found no NFS after account gc") - return \ No newline at end of file + return http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a9d8333c/test/integration/component/test_snapshot_limits.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_snapshot_limits.py b/test/integration/component/test_snapshot_limits.py index 429e67e..577b9e5 100644 --- a/test/integration/component/test_snapshot_limits.py +++ b/test/integration/component/test_snapshot_limits.py @@ -270,7 +270,7 @@ class TestSnapshotLimit(cloudstackTestCase): ssh_client.execute(c) except Exception as e: self.fail("SSH failed for management server: %s - %s" % - (self.services["mgmt_server"]["ipaddress"], e)) + (self.config.mgtSvr[0].mgtSvrIp, e)) res = str(snapshots) return res.count(snapshot_id) == 1 @@ -384,4 +384,4 @@ class TestSnapshotLimit(cloudstackTestCase): qresult = qresultset[0] snapshot_id = qresult[0] self.is_snapshot_on_nfs(snapshot_id) - return \ No newline at end of file + return http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a9d8333c/test/integration/component/test_snapshots.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_snapshots.py b/test/integration/component/test_snapshots.py index fcb042b..49b10fe 100644 --- a/test/integration/component/test_snapshots.py +++ b/test/integration/component/test_snapshots.py @@ -262,7 +262,7 @@ class TestSnapshots(cloudstackTestCase): ssh_client.execute(c) except Exception as e: self.fail("SSH failed for management server: %s - %s" % - (self.services["mgmt_server"]["ipaddress"], e)) + (self.config.mgtSvr[0].mgtSvrIp, e)) res = str(snapshots) return res.count(snapshot_id) == 1
