summaryrefslogtreecommitdiffstats
path: root/testapi
diff options
context:
space:
mode:
authorMatthewLi <lijun_1203@126.com>2017-07-14 00:30:50 -0400
committerMatthewLi <lijun_1203@126.com>2017-07-14 02:32:56 -0400
commit6e0054da0279207486e9b8ee8d85adaffe859996 (patch)
tree9e894a03db951f0ad15f9e2ee12667c68bdd0c37 /testapi
parentd6e534598310012cf6e50bb75390497217f677bc (diff)
testapi: bugfix of tox
error log https://gerrit.opnfv.org/gerrit/#/c/37053/ https://build.opnfv.org/ci/job/testapi-verify-master/220/console Change-Id: Id278edad06c2852c662392d75fd3cf4041b03451 Signed-off-by: MatthewLi <lijun_1203@126.com>
Diffstat (limited to 'testapi')
-rw-r--r--testapi/htmlize/htmlize.py1
-rw-r--r--testapi/opnfv_testapi/tests/unit/resources/test_pod.py1
-rw-r--r--testapi/opnfv_testapi/tests/unit/resources/test_project.py1
-rw-r--r--testapi/opnfv_testapi/tests/unit/resources/test_token.py1
-rw-r--r--testapi/requirements.txt2
-rw-r--r--testapi/setup.py6
-rw-r--r--testapi/tox.ini3
-rw-r--r--testapi/update/templates/backup_mongodb.py1
-rw-r--r--testapi/update/templates/update_mongodb.py1
9 files changed, 13 insertions, 4 deletions
diff --git a/testapi/htmlize/htmlize.py b/testapi/htmlize/htmlize.py
index 4576d9b..da6a6cf 100644
--- a/testapi/htmlize/htmlize.py
+++ b/testapi/htmlize/htmlize.py
@@ -33,6 +33,7 @@ def main(args):
else:
exit(1)
+
if __name__ == '__main__':
parser = argparse.ArgumentParser(description='Create \
Swagger Spec documentation')
diff --git a/testapi/opnfv_testapi/tests/unit/resources/test_pod.py b/testapi/opnfv_testapi/tests/unit/resources/test_pod.py
index 8e0ae40..cb4f1d9 100644
--- a/testapi/opnfv_testapi/tests/unit/resources/test_pod.py
+++ b/testapi/opnfv_testapi/tests/unit/resources/test_pod.py
@@ -85,5 +85,6 @@ class TestPodGet(TestPodBase):
else:
self.assert_get_body(pod, self.req_e)
+
if __name__ == '__main__':
unittest.main()
diff --git a/testapi/opnfv_testapi/tests/unit/resources/test_project.py b/testapi/opnfv_testapi/tests/unit/resources/test_project.py
index 5a2ce75..0622ba8 100644
--- a/testapi/opnfv_testapi/tests/unit/resources/test_project.py
+++ b/testapi/opnfv_testapi/tests/unit/resources/test_project.py
@@ -132,5 +132,6 @@ class TestProjectDelete(TestProjectBase):
code, body = self.get(self.req_d.name)
self.assertEqual(code, httplib.NOT_FOUND)
+
if __name__ == '__main__':
unittest.main()
diff --git a/testapi/opnfv_testapi/tests/unit/resources/test_token.py b/testapi/opnfv_testapi/tests/unit/resources/test_token.py
index c9d4b72..b4ba887 100644
--- a/testapi/opnfv_testapi/tests/unit/resources/test_token.py
+++ b/testapi/opnfv_testapi/tests/unit/resources/test_token.py
@@ -109,5 +109,6 @@ class TestTokenUpdateProject(TestToken):
def _update_success(self, request, body):
self.assertIn(request.name, body)
+
if __name__ == '__main__':
unittest.main()
diff --git a/testapi/requirements.txt b/testapi/requirements.txt
index 955ffc8..d2a45dc 100644
--- a/testapi/requirements.txt
+++ b/testapi/requirements.txt
@@ -2,7 +2,7 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
-pbr>=1.6
+pbr==2.0.0
setuptools>=16.0
tornado>=3.1,<=4.3
epydoc>=0.3.1
diff --git a/testapi/setup.py b/testapi/setup.py
index 15dda96..f689cb3 100644
--- a/testapi/setup.py
+++ b/testapi/setup.py
@@ -3,7 +3,11 @@ import setuptools
__author__ = 'serena'
+try:
+ import multiprocessing # noqa
+except ImportError:
+ pass
setuptools.setup(
- setup_requires=['pbr>=1.8'],
+ setup_requires=['pbr==2.0.0'],
pbr=True)
diff --git a/testapi/tox.ini b/testapi/tox.ini
index 81c9dfa..65f5fb6 100644
--- a/testapi/tox.ini
+++ b/testapi/tox.ini
@@ -4,7 +4,7 @@
# and then run "tox" from this directory.
[tox]
-envlist = py27,pep8
+envlist = pep8,py27
skipsdist = True
sitepackages = True
@@ -17,7 +17,6 @@ deps =
commands=
py.test \
--basetemp={envtmpdir} \
- --cov \
{posargs}
setenv=
HOME = {envtmpdir}
diff --git a/testapi/update/templates/backup_mongodb.py b/testapi/update/templates/backup_mongodb.py
index 7e0dd55..9c24377 100644
--- a/testapi/update/templates/backup_mongodb.py
+++ b/testapi/update/templates/backup_mongodb.py
@@ -40,5 +40,6 @@ def backup(args):
cmd = ['mongodump', '-o', '%s' % out]
execute(cmd, args)
+
if __name__ == '__main__':
main(backup, parser)
diff --git a/testapi/update/templates/update_mongodb.py b/testapi/update/templates/update_mongodb.py
index ba4334a..f759592 100644
--- a/testapi/update/templates/update_mongodb.py
+++ b/testapi/update/templates/update_mongodb.py
@@ -85,5 +85,6 @@ def update(args):
rename_fields(fields_old2New)
rename_collections(collections_old2New)
+
if __name__ == '__main__':
main(update, parser)