You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2014/07/28 23:14:17 UTC
[49/50] [abbrv] git commit: updated refs/heads/4.4 to 2025f35
CLOUDSTACK-7178: Correcting imports in test_escalations* test cases
(cherry picked from commit 4e45b296891f71fc7991dc507dc7ae9cec6f5496)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2025f359
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2025f359
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2025f359
Branch: refs/heads/4.4
Commit: 2025f359c4fbff6b24132d39e8cf587315a2a981
Parents: 5898745
Author: Gaurav Aradhye <ga...@clogeny.com>
Authored: Thu Jul 24 01:03:45 2014 -0400
Committer: Daan Hoogland <da...@onecht.net>
Committed: Mon Jul 28 23:12:58 2014 +0200
----------------------------------------------------------------------
.../component/test_escalations_ipaddresses.py | 38 +++++++++++++-------
.../component/test_escalations_snapshots.py | 26 +++++++-------
2 files changed, 40 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2025f359/test/integration/component/test_escalations_ipaddresses.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_escalations_ipaddresses.py b/test/integration/component/test_escalations_ipaddresses.py
index 0b31d2e..411dae0 100644
--- a/test/integration/component/test_escalations_ipaddresses.py
+++ b/test/integration/component/test_escalations_ipaddresses.py
@@ -16,18 +16,32 @@
# under the License.
# Import Local Modules
-from marvin.cloudstackTestCase import *
-from marvin.cloudstackException import *
-from marvin.cloudstackAPI import *
-from marvin.sshClient import SshClient
-from marvin.lib.utils import *
-from marvin.lib.base import *
-from marvin.lib.common import *
-from marvin.lib.utils import checkVolumeSize
-from marvin.codes import SUCCESS
+from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.lib.base import (PublicIPAddress,
+ NetworkOffering,
+ Autoscale,
+ Network,
+ NetworkServiceProvider,
+ Template,
+ VirtualMachine,
+ VPC,
+ VpcOffering,
+ StaticNATRule,
+ FireWallRule,
+ NATRule,
+ Vpn,
+ VpnUser,
+ LoadBalancerRule,
+ Account,
+ ServiceOffering,
+ PhysicalNetwork,
+ User)
+from marvin.lib.common import (get_domain,
+ get_zone,
+ get_template)
+from marvin.lib.utils import validateList, cleanup_resources
+from marvin.codes import PASS
from nose.plugins.attrib import attr
-from time import sleep
-from ctypes.wintypes import BOOLEAN
class TestIpAddresses(cloudstackTestCase):
@@ -1730,7 +1744,7 @@ class TestIpAddresses(cloudstackTestCase):
"Load Balancer Sticky Policy creation Failed"
)
# Deleting the Sticky Policy
- deleted = LoadBalancerRule.deleteSticky(
+ LoadBalancerRule.deleteSticky(
lb_rule,
self.userapiclient,
id=sticky_policy.stickinesspolicy[0].id
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2025f359/test/integration/component/test_escalations_snapshots.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_escalations_snapshots.py b/test/integration/component/test_escalations_snapshots.py
index 0aa36c3..9bb3b50 100644
--- a/test/integration/component/test_escalations_snapshots.py
+++ b/test/integration/component/test_escalations_snapshots.py
@@ -16,18 +16,20 @@
# under the License.
# Import Local Modules
-from marvin.cloudstackTestCase import *
-from marvin.cloudstackException import *
-from marvin.cloudstackAPI import *
-from marvin.sshClient import SshClient
-from marvin.lib.utils import *
-from marvin.lib.base import *
-from marvin.lib.common import *
-from marvin.lib.utils import checkVolumeSize
-from marvin.codes import SUCCESS
+from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.lib.base import (VmSnapshot,
+ Snapshot,
+ DiskOffering,
+ ServiceOffering,
+ VirtualMachine,
+ Account,
+ Volume)
+from marvin.lib.common import (get_domain,
+ get_zone,
+ get_template)
+from marvin.lib.utils import validateList, cleanup_resources
+from marvin.codes import PASS
from nose.plugins.attrib import attr
-from time import sleep
-from ctypes.wintypes import BOOLEAN
class TestSnapshots(cloudstackTestCase):
@@ -626,4 +628,4 @@ class TestSnapshots(cloudstackTestCase):
vm_snapshot_status,
"Listed VM Snapshot details are not as expected"
)
- return
\ No newline at end of file
+ return