From c4f9855668d2f6702e10cf1b9caa30645ca96ae3 Mon Sep 17 00:00:00 2001 From: Prasanna Santhanam Date: Mon, 30 Sep 2013 11:39:58 +0530 Subject: [PATCH] marvin_refactor: CLOUDSTACK-4591 - switch to unittest2 Switch marvin to unittest2 so as to support multiple python versions Signed-off-by: Prasanna Santhanam --- tools/marvin/marvin/TestCaseExecuteEngine.py | 2 +- tools/marvin/marvin/cloudstackTestCase.py | 2 +- tools/marvin/marvin/factory/data/vm.py | 13 ++----------- tools/marvin/marvin/sandbox/testSetupSuccess.py | 2 -- tools/marvin/marvin/test/test_factories.py | 2 +- tools/marvin/marvin/testSetupSuccess.py | 2 -- tools/marvin/setup.py | 1 + 7 files changed, 6 insertions(+), 18 deletions(-) diff --git a/tools/marvin/marvin/TestCaseExecuteEngine.py b/tools/marvin/marvin/TestCaseExecuteEngine.py index f5af1fe2c1e..6495000af3b 100644 --- a/tools/marvin/marvin/TestCaseExecuteEngine.py +++ b/tools/marvin/marvin/TestCaseExecuteEngine.py @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. -import unittest +import unittest2 as unittest import os import sys import logging diff --git a/tools/marvin/marvin/cloudstackTestCase.py b/tools/marvin/marvin/cloudstackTestCase.py index 85ef5423091..b337944b72b 100644 --- a/tools/marvin/marvin/cloudstackTestCase.py +++ b/tools/marvin/marvin/cloudstackTestCase.py @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. -import unittest +import unittest2 as unittest def user(Name, DomainName, AcctType): diff --git a/tools/marvin/marvin/factory/data/vm.py b/tools/marvin/marvin/factory/data/vm.py index b9e63459ddb..713c9b536fa 100644 --- a/tools/marvin/marvin/factory/data/vm.py +++ b/tools/marvin/marvin/factory/data/vm.py @@ -39,19 +39,10 @@ class VirtualMachineWithStaticNat(VirtualMachineFactory): domainid=self.domainid, zoneid=self.zoneid, ) - ssh_fwrule = SshFirewallRule( - apiclient=self.apiclient, - ipaddressid=ipassoc.id - ) - ntwks = Network.list( - apiclient=self.apiclient, - account=self.account, - domainid=self.domainid, - ) - ntwks[0].enableStaticNat( + ipassoc.enableStaticNat( apiclient=self.apiclient, ipaddressid=ipassoc.id, - virtualmachineid=self.id, + virtualmachineid=self.id ) self.ssh_ip = ipassoc.ipaddress self.public_ip = ipassoc.ipaddress diff --git a/tools/marvin/marvin/sandbox/testSetupSuccess.py b/tools/marvin/marvin/sandbox/testSetupSuccess.py index 8a0034cfa9b..452f1725b8a 100644 --- a/tools/marvin/marvin/sandbox/testSetupSuccess.py +++ b/tools/marvin/marvin/sandbox/testSetupSuccess.py @@ -15,8 +15,6 @@ # specific language governing permissions and limitations # under the License. -import marvin -import unittest from marvin.cloudstackTestCase import * from marvin.cloudstackAPI import * from time import sleep as delay diff --git a/tools/marvin/marvin/test/test_factories.py b/tools/marvin/marvin/test/test_factories.py index b3ea0ac3252..75bf45289ce 100644 --- a/tools/marvin/marvin/test/test_factories.py +++ b/tools/marvin/marvin/test/test_factories.py @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. -import unittest +import unittest2 as unittest import logging from nose.plugins.attrib import attr from should_dsl import should, should_not diff --git a/tools/marvin/marvin/testSetupSuccess.py b/tools/marvin/marvin/testSetupSuccess.py index 1701626a820..9652fa0c668 100644 --- a/tools/marvin/marvin/testSetupSuccess.py +++ b/tools/marvin/marvin/testSetupSuccess.py @@ -15,8 +15,6 @@ # specific language governing permissions and limitations # under the License. -import marvin -import unittest from marvin.cloudstackTestCase import * from marvin.cloudstackAPI import * from time import sleep as delay diff --git a/tools/marvin/setup.py b/tools/marvin/setup.py index 4a1cbc271ae..231a00adad2 100644 --- a/tools/marvin/setup.py +++ b/tools/marvin/setup.py @@ -49,6 +49,7 @@ setup(name="Marvin", "marvin.test"], license="LICENSE.txt", install_requires=[ + "unittest2", "mysql-connector-python", "requests", "paramiko",