From 70a9d3eb570fa95bed3488d9937e3a27d2233379 Mon Sep 17 00:00:00 2001 From: Prasanna Santhanam Date: Mon, 16 Sep 2013 11:52:40 +0530 Subject: [PATCH] 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 --- tools/marvin/marvin/deployer/deployDataCenter.py | 2 +- tools/marvin/setup.py | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tools/marvin/marvin/deployer/deployDataCenter.py b/tools/marvin/marvin/deployer/deployDataCenter.py index 1c9b48f2cde..d989bb00e78 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 diff --git a/tools/marvin/setup.py b/tools/marvin/setup.py index cbaa157cebb..4a1cbc271ae 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",