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 2013/11/18 09:50:33 UTC
[26/50] [abbrv] git commit: updated refs/heads/marvin_refactor to
b784012
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 <ts...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/70a9d3eb
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/70a9d3eb
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/70a9d3eb
Branch: refs/heads/marvin_refactor
Commit: 70a9d3eb570fa95bed3488d9937e3a27d2233379
Parents: ef0b08e
Author: Prasanna Santhanam <ts...@apache.org>
Authored: Mon Sep 16 11:52:40 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Thu Oct 31 13:54:24 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/70a9d3eb/tools/marvin/marvin/deployer/deployDataCenter.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/deployer/deployDataCenter.py b/tools/marvin/marvin/deployer/deployDataCenter.py
index 1c9b48f..d989bb0 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/70a9d3eb/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",