etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Prasanna Santhanam 2013-09-16 11:52:40 +05:30
parent ef0b08e21a
commit 70a9d3eb57
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/marvin/marvin/deployer/deployDataCenter.py
View File

@ -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

8
tools/marvin/setup.py
View File

@ -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",