deployRunner to run when no format is given format option was deprecated. But the testrunner wouldn't run without it specified. Fixed this by removing traces of format.
Signed-off-by: Prasanna Santhanam <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e140556e Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e140556e Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e140556e Branch: refs/heads/bvt Commit: e140556eb3cbe8eb7b5b2632dd21800e0e5d714d Parents: cf9c78b Author: Prasanna Santhanam <[email protected]> Authored: Fri Mar 22 19:38:41 2013 +0530 Committer: Prasanna Santhanam <[email protected]> Committed: Fri Mar 22 19:38:41 2013 +0530 ---------------------------------------------------------------------- tools/marvin/marvin/TestCaseExecuteEngine.py | 4 +-- .../sandbox/demo/simulator/simulator_setup.py | 2 +- tools/marvin/marvin/testSetupSuccess.py | 4 -- tools/marvin/pom.xml | 29 +++++++++++++-- 4 files changed, 27 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e140556e/tools/marvin/marvin/TestCaseExecuteEngine.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/TestCaseExecuteEngine.py b/tools/marvin/marvin/TestCaseExecuteEngine.py index 144c5db..5743868 100644 --- a/tools/marvin/marvin/TestCaseExecuteEngine.py +++ b/tools/marvin/marvin/TestCaseExecuteEngine.py @@ -37,7 +37,6 @@ class TestCaseExecuteEngine(object): self.logformat = logging.Formatter("%(asctime)s - %(levelname)s - %(name)s - %(message)s") self.loader = unittest.loader.TestLoader() self.suite = None - self.format = format if testcaseLogFile is not None: self.logfile = testcaseLogFile @@ -89,5 +88,4 @@ class TestCaseExecuteEngine(object): def run(self): if self.suite: - if self.format == "text": - unittest.TextTestRunner(stream=self.testResultLogFile, verbosity=2).run(self.suite) + unittest.TextTestRunner(stream=self.testResultLogFile, verbosity=2).run(self.suite) http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e140556e/tools/marvin/marvin/sandbox/demo/simulator/simulator_setup.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/sandbox/demo/simulator/simulator_setup.py b/tools/marvin/marvin/sandbox/demo/simulator/simulator_setup.py index 0d34140..e4ec9b7 100644 --- a/tools/marvin/marvin/sandbox/demo/simulator/simulator_setup.py +++ b/tools/marvin/marvin/sandbox/demo/simulator/simulator_setup.py @@ -41,7 +41,6 @@ def describeResources(config): z.name = 'Sandbox-%s'%(config.get('environment', 'hypervisor')) z.networktype = 'Advanced' z.guestcidraddress = '10.1.1.0/24' - z.vlan = config.get('cloudstack', 'zone.vlan') vpcprovider = provider() vpcprovider.name = 'VpcVirtualRouter' @@ -50,6 +49,7 @@ def describeResources(config): pn.name = "Sandbox-pnet" pn.traffictypes = [traffictype("Guest"), traffictype("Management"), traffictype("Public")] pn.providers.append(vpcprovider) + pn.vlan = config.get('cloudstack', 'zone.vlan') z.physical_networks.append(pn) http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e140556e/tools/marvin/marvin/testSetupSuccess.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/testSetupSuccess.py b/tools/marvin/marvin/testSetupSuccess.py index 90717dc..d1de9be 100644 --- a/tools/marvin/marvin/testSetupSuccess.py +++ b/tools/marvin/marvin/testSetupSuccess.py @@ -76,10 +76,6 @@ class TestSetupSuccess(cloudstackTestCase): delay(60) #wait a minute for retry self.assertNotEqual(retry, 0, "builtIn templates not ready in zone %s"%z.name) - def test_deployVmWithBuiltIn(self): - """ - Deploys a VM with the built-in CentOS template - """ @classmethod def tearDownClass(cls): pass http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e140556e/tools/marvin/pom.xml ---------------------------------------------------------------------- diff --git a/tools/marvin/pom.xml b/tools/marvin/pom.xml index 7262580..5a8a1c5 100644 --- a/tools/marvin/pom.xml +++ b/tools/marvin/pom.xml @@ -65,8 +65,8 @@ </configuration> </execution> <execution> - <id>package</id> - <phase>package</phase> + <id>install</id> + <phase>install</phase> <goals> <goal>exec</goal> </goals> @@ -128,9 +128,8 @@ </goals> <configuration> <workingDirectory>${basedir}/marvin</workingDirectory> - <executable>python</executable> + <executable>/usr/local/bin/nosetests</executable> <arguments> - <argument>/usr/local/bin/nosetests</argument> <argument>--with-marvin</argument> <argument>--marvin-config</argument> <argument>${user.dir}/${marvin.config}</argument> @@ -141,6 +140,28 @@ </arguments> </configuration> </execution> + <!--execution> + <id>pre-integration-test</id> + <phase>pre-integration-test</phase> + <goals> + <goal>exec</goal> + </goals> + <configuration> + <workingDirectory>${basedir}/marvin</workingDirectory> + <executable>python</executable> + <arguments> + <argument>deployAndRun.py</argument> + <argument>-c</argument> + <argument>${user.dir}/${marvin.config}</argument> + <argument>-t</argument> + <argument>/tmp/t.log</argument> + <argument>-r</argument> + <argument>/tmp/r.log</argument> + <argument>-f</argument> + <argument>${basedir}/marvin/testSetupSuccess.py</argument> + </arguments> + </configuration> + </execution--> </executions> </plugin> </plugins>
