From b0947adf3273a577a44485f155236bb705a72131 Mon Sep 17 00:00:00 2001 From: Jon Wayne Parrott Date: Mon, 22 Feb 2016 15:05:13 -0800 Subject: [PATCH] Removing nose dependencies --- .coveragerc | 4 ++-- .gitignore | 3 --- TESTING.md | 7 +++---- appengine/resources/app.yaml | 2 +- container_engine/django_tutorial/.dockerignore | 1 - requirements-py27-dev.txt | 4 ---- requirements-py34-dev.txt | 4 ---- 7 files changed, 6 insertions(+), 19 deletions(-) diff --git a/.coveragerc b/.coveragerc index c24f83113ef0..b332653b7270 100644 --- a/.coveragerc +++ b/.coveragerc @@ -3,12 +3,12 @@ include = appengine/* bigquery/* blog/* + cloud_logging/* compute/* datastore/* + managed_vms/* monitoring/* storage/* - cloud_logging/* - managed_vms/* [report] exclude_lines = pragma: NO COVER diff --git a/.gitignore b/.gitignore index cbe7b6c36208..184297e92b12 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,8 @@ .coveralls.yml -coverage-gae.json *.pyc .coverage .tox coverage.xml -nosetests.xml -nosetests-*.xml python-docs-samples.json service-account.json __pycache__ diff --git a/TESTING.md b/TESTING.md index f88f6ce63ac6..0d57ff240c2f 100644 --- a/TESTING.md +++ b/TESTING.md @@ -64,14 +64,13 @@ flag: tox -e py27 To run one particular test suite or provide additional parameters to -``nose``, invoke tox like this: +``py.test``, invoke tox like this: - toxe -e py27 -- storage/tests/test_list_objects.py + toxe -e py27 -- storage/api ### Adding new tests -When adding a new top-level directory, be sure to edit ``.coveragerc`` -to include it in coveralls. +When adding a new top-level directory, be sure to edit ``.coveragerc`` and ``tox.ini`` to include it in tests and coverage reporting. To add new tests that require Google App Engine, please place them in the ``appengine`` directory if possible. If you place them elsewhere, diff --git a/appengine/resources/app.yaml b/appengine/resources/app.yaml index 907c57fbff52..18650e00fe60 100644 --- a/appengine/resources/app.yaml +++ b/appengine/resources/app.yaml @@ -1,4 +1,4 @@ -# dummy app.yaml for nosegae +# dummy app.yaml for tests api_version: 1 runtime: python27 diff --git a/container_engine/django_tutorial/.dockerignore b/container_engine/django_tutorial/.dockerignore index 721c69878d7d..aaca40b6a515 100644 --- a/container_engine/django_tutorial/.dockerignore +++ b/container_engine/django_tutorial/.dockerignore @@ -13,7 +13,6 @@ pip-delete-this-directory.txt .coverage .coverage.* .cache -nosetests.xml coverage.xml *,cover *.log diff --git a/requirements-py27-dev.txt b/requirements-py27-dev.txt index da1be46332c0..2b45dfec43de 100644 --- a/requirements-py27-dev.txt +++ b/requirements-py27-dev.txt @@ -10,16 +10,12 @@ itsdangerous==0.24 Jinja2==2.8 MarkupSafe==0.23 mock==1.3.0 -nose==1.3.7 -nose-exclude==0.4.1 -nosegae==0.5.8 pbr==1.8.1 PyYAML==3.11 waitress==0.8.10 WebOb==1.6.0a0 WebTest==2.0.20 Werkzeug==0.11.4 -nose-timer==0.6.0 Flask-SQLAlchemy==2.1 PyMySQL==0.7.1 pymemcache==1.3.5 diff --git a/requirements-py34-dev.txt b/requirements-py34-dev.txt index 98f1168c1782..dabacdf4446a 100644 --- a/requirements-py34-dev.txt +++ b/requirements-py34-dev.txt @@ -10,16 +10,12 @@ itsdangerous==0.24 Jinja2==2.8 MarkupSafe==0.23 mock==1.3.0 -nose==1.3.7 -nose-exclude==0.4.1 -nosegae==0.5.8 pbr==1.8.1 PyYAML==3.11 waitress==0.8.10 WebOb==1.6.0a0 WebTest==2.0.20 Werkzeug==0.11.4 -nose-timer==0.6.0 Flask-SQLAlchemy==2.1 PyMySQL==0.7.1 pymemcache==1.3.5