cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject [33/50] [abbrv] git commit: updated refs/heads/marvin-refactor to bbaf354
Date Wed, 02 Oct 2013 16:42:03 GMT
marvin_refactor: allow the nose plugin to load

include deployer module in the packaging and correct cloudstackAPI
import to use absolute imports

Signed-off-by: Prasanna Santhanam <tsp@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/09621e5b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/09621e5b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/09621e5b

Branch: refs/heads/marvin-refactor
Commit: 09621e5b7fe2992c50de0522baf460cde29eb2b9
Parents: 73aabab
Author: Prasanna Santhanam <tsp@apache.org>
Authored: Mon Sep 16 11:52:40 2013 +0530
Committer: Prasanna Santhanam <tsp@apache.org>
Committed: Wed Oct 2 20:27:54 2013 +0530

----------------------------------------------------------------------
 tools/marvin/marvin/deployer/deployDataCenter.py | 2 +-
 tools/marvin/setup.py                            | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/09621e5b/tools/marvin/marvin/deployer/deployDataCenter.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/deployer/deployDataCenter.py b/tools/marvin/marvin/deployer/deployDataCenter.py
index 0c1c639..4df05bb 100644
--- a/tools/marvin/marvin/deployer/deployDataCenter.py
+++ b/tools/marvin/marvin/deployer/deployDataCenter.py
@@ -20,7 +20,7 @@ import logging
 import configGenerator
 from os import path
 from time import sleep
-from cloudstackAPI import *
+from marvin.cloudstackAPI import *
 from optparse import OptionParser
 from marvin import cloudstackTestClient
 from marvin import cloudstackException

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/09621e5b/tools/marvin/setup.py
----------------------------------------------------------------------
diff --git a/tools/marvin/setup.py b/tools/marvin/setup.py
index cbaa157..4a1cbc2 100644
--- a/tools/marvin/setup.py
+++ b/tools/marvin/setup.py
@@ -42,9 +42,11 @@ setup(name="Marvin",
     maintainer_email="tsp@apache.org",
     long_description="Marvin is the Apache CloudStack python client written around the unittest
framework",
     platforms=("Any",),
-    packages=["marvin", "marvin.cloudstackAPI", "marvin.entity", "marvin.factory", "marvin.factory.data",
-              "marvin.generate", "marvin.legacy", "marvin.sandbox", "marvin.sandbox.advanced",
-              "marvin.sandbox.advancedsg", "marvin.sandbox.basic"],
+    packages=["marvin", "marvin.cloudstackAPI",
+              "marvin.deployer", "marvin.entity", "marvin.factory", "marvin.factory.data",
+              "marvin.generate", "marvin.legacy",
+              "marvin.sandbox", "marvin.sandbox.advanced", "marvin.sandbox.advancedsg", "marvin.sandbox.basic",
+              "marvin.test"],
     license="LICENSE.txt",
     install_requires=[
         "mysql-connector-python",


Mime
View raw message