You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ts...@apache.org on 2012/07/30 12:07:19 UTC
[5/16] git commit: All responsibilty for running through nose belongs
to the marvin-nose plugin
All responsibilty for running through nose belongs to the marvin-nose plugin
Conflicts:
tools/marvin/marvin/NoseTestExecuteEngine.py
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/76624267
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/76624267
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/76624267
Branch: refs/heads/master
Commit: 766242676947a0ec308ae4192f8d81763a361251
Parents: 1385770
Author: Prasanna Santhanam <Pr...@citrix.com>
Authored: Mon Jul 23 19:25:07 2012 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Mon Jul 30 15:32:34 2012 +0530
----------------------------------------------------------------------
tools/marvin/marvin/NoseTestExecuteEngine.py | 102 ---------------------
1 files changed, 0 insertions(+), 102 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/76624267/tools/marvin/marvin/NoseTestExecuteEngine.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/NoseTestExecuteEngine.py b/tools/marvin/marvin/NoseTestExecuteEngine.py
deleted file mode 100644
index 5304afe..0000000
--- a/tools/marvin/marvin/NoseTestExecuteEngine.py
+++ /dev/null
@@ -1,102 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-from functools import partial
-import unittest
-import nose
-import nose.core
-import os
-import sys
-import logging
-import xmlrunner
-from cloudstackTestCase import cloudstackTestCase
-from marvinPlugin import MarvinPlugin
-from nose.plugins.xunit import Xunit
-from nose.plugins.attrib import AttributeSelector
-from nose.plugins.multiprocess import MultiProcessTestRunner
-
-
-class NoseTestExecuteEngine(object):
- """
- Runs the CloudStack tests using nose as the execution engine
- """
-
- def __init__(self, testclient=None, workingdir=None, filename=None, clientLog=None, resultLog=None, format="text", xmlDir='xml-reports'):
- self.testclient = testclient
- self.logformat = logging.Formatter("%(asctime)s - %(levelname)s - %(name)s - %(message)s")
- self.suite = []
-
- if clientLog is not None:
- self.logfile = clientLog
- self.logger = logging.getLogger("NoseTestExecuteEngine")
- fh = logging.FileHandler(self.logfile)
- fh.setFormatter(self.logformat)
- self.logger.addHandler(fh)
- self.logger.setLevel(logging.DEBUG)
- if resultLog is not None:
- ch = logging.StreamHandler()
- ch.setLevel(logging.ERROR)
- ch.setFormatter(self.logformat)
- self.logger.addHandler(ch)
- fp = open(resultLog, "w")
- self.testResultLogFile = fp
- else:
- self.testResultLogFile = sys.stderr
-
- if workingdir is not None:
- self.workingdir = workingdir
- self.test_picker = MarvinPlugin()
- self.test_picker.setClient(self.testclient)
- self.test_picker.setClientLog(self.logfile)
- elif filename is not None:
- self.test_picker = MarvinPlugin()
- self.test_picker.setClient(self.testclient)
- self.test_picker.setClientLog(self.logfile)
- self.filename = filename
- else:
- raise EnvironmentError("Need to give either a test directory or a test file")
-
- plug_mgr = nose.plugins.manager.PluginManager()
- plug_mgr.addPlugin(self.test_picker)
- plug_mgr.addPlugin(Xunit())
- plug_mgr.addPlugin(AttributeSelector())
- plug_mgr.addPlugin(MultiProcessTestRunner())
- self.cfg = nose.config.Config()
- self.cfg.plugins = plug_mgr
-
- if format == "text":
- self.runner = \
- nose.core.TextTestRunner(stream=self.testResultLogFile,
- descriptions=1, verbosity=2, config=self.cfg)
- else:
- self.runner = xmlrunner.XMLTestRunner(output=xmlDir, verbose=True)
-
- def runTests(self):
- options = ["--process-timeout=3600", "--with-xunit", "-a tags=advanced", "--processes=5"] #TODO: Add support for giving nose args
- #DEBUG
-# options = ["--process-timeout=3600", "--with-xunit", "--collect-only"]
- #DEBUG
-# options = ["--process-timeout=3600"]
- options.append("-w%s" %self.workingdir)
-
- if self.workingdir is not None:
- nose.core.TestProgram(argv=options, testRunner=self.runner,
- config=self.cfg)
- elif self.filename is not None:
- tests = self.loader.loadTestsFromFile(self.filename)
- nose.core.TestProgram(argv=options, testRunner=self.runner,
- config=self.cfg)