diff options
| author |   Bin Yang <bin.yang@windriver.com> | 2017-11-22 06:59:07 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-11-22 06:59:07 +0000 |
| commit | d336a8977549ae0e8349b9193b0c9edd7a9d20c8 (patch) | |
| tree | 00195941671d15e022eadf6a4ddd72114a5c1761 /newton | |
| parent | 50189abcb2568186900c911911efdae5686ef8fc (diff) | |
| parent | 569d05a52d0f034b8cd082f6b9e1049898a39b0e (diff) | |
Merge "Separate test modules from requirements.txt"
Diffstat (limited to 'newton')
| -rw-r--r-- | newton/requirements.txt | 17 | ||||
| -rw-r--r-- | newton/test-requirements.txt | 3 | ||||
| -rw-r--r-- | newton/tox.ini | 8 |
3 files changed, 16 insertions, 12 deletions
diff --git a/newton/requirements.txt b/newton/requirements.txt index 841fe278..13ced9ef 100644 --- a/newton/requirements.txt +++ b/newton/requirements.txt @@ -1,17 +1,12 @@ # rest framework -Django==1.9.6 -djangorestframework==3.3.3 +Django==1.9.6 # BSD +djangorestframework==3.3.3 # BSD # for call rest api -httplib2==0.9.2 +httplib2==0.9.2 # MIT # for call openstack auth and transport api -keystoneauth1==2.18.0 +keystoneauth1==2.19.0 # Apache-2.0 -#python-memcached -python-memcached - -# for unit test -coverage==4.2 -mock==2.0.0 -unittest_xml_reporting==1.12.0 +# for memcached +python-memcached # PSF diff --git a/newton/test-requirements.txt b/newton/test-requirements.txt new file mode 100644 index 00000000..91213a4c --- /dev/null +++ b/newton/test-requirements.txt @@ -0,0 +1,3 @@ +coverage==4.2 # Apache-2.0 +mock==2.0.0 # BSD +unittest_xml_reporting==1.12.0 #BSD diff --git a/newton/tox.ini b/newton/tox.ini index 71a8ff75..d5eb878e 100644 --- a/newton/tox.ini +++ b/newton/tox.ini @@ -6,7 +6,13 @@ skipsdist = true downloadcache = ~/cache/pip [testenv] -deps = -r{toxinidir}/requirements.txt +passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY +deps = + -r{toxinidir}/requirements.txt + -r{toxinidir}/test-requirements.txt commands = coverage run --branch manage.py test + +[testenv:cover] +commands = coverage report --omit=".tox/*,*tests*,*__init__.py" --fail-under=30 |