Merge pull request #480 from eregs/472-pytest

Replace nose with py.test

Author: cmc333333

Gruntfile.js

@@ -134,24 +134,6 @@ module.exports = function toExport(grunt) {
         },
       },
     },
-
-    shell: {
-      'nose-chrome': {
-        command: 'nosetests -s <%= config.testPath %> --tc=remote:chrome --tc=testUrl:<%= config.testUrl %>',
-        options: {
-          stdout: true,
-          stderr: true,
-        },
-      },
-
-      'nose-ie11': {
-        command: 'nosetests -s <%= config.testPath %> --tc=remote:ie11 --tc=testUrl:<%= config.testUrl %>',
-        options: {
-          stdout: true,
-          stderr: true,
-        },
-      },
-    },
   });
 
   /* eslint-disable global-require,import/no-extraneous-dependencies */
@@ -172,8 +154,7 @@ module.exports = function toExport(grunt) {
   /**
    * Create task aliases by registering new tasks
    */
-  grunt.registerTask('nose', ['shell:nose-chrome', 'shell:nose-ie11']);
-  grunt.registerTask('test', ['eslint', 'mocha_istanbul', 'nose']);
+  grunt.registerTask('test', ['eslint', 'mocha_istanbul']);
   grunt.registerTask('test-js', ['eslint', 'mocha_istanbul']);
   grunt.registerTask('build-dev', ['env:dev', 'copy', 'browserify:dev', 'sass']);
   grunt.registerTask('build-dist', ['env:dist', 'copy', 'browserify:dist', 'sass', 'cssmin']);

README.md

@@ -38,10 +38,7 @@ Requirements are retrieved and/or build automatically via pip (see below).
 If running tests:
 
 * mock - makes constructing mock objects/functions easy
-* django-nose - provides nosetest as a test runner
-* nose-exclude - allows certain directories to be excluded from nose
-* nose-testconfig - pass configuration data to tests; used to configure
-  selenium tests
+* py.test - provides py.test as a test runner
 * coverage - provides test-coverage metrics
 
 ## Setup & Running
@@ -158,9 +155,9 @@ After you create a [Sauce Labs](https://saucelabs.com) account:
 
 ##### For functional tests
 - They also require having the environment serving data from ```dummy_api/```. To start the dummy API, from the root of your repo, run ```./dummy_api/start.sh 0.0.0.0:8282```.
-- The tests run using [nose](http://nose.readthedocs.org/en/latest/). If you wish to run the tests outside of the Grunt environment, you may by running ```nosetests regulations/uitests/*.py``` from the root of the repo.
-- By default, functional tests run using a local PhantomJS driver. To run using a different local browser, pass the `local` option, e.g. `tc=local:Chrome`; the option should be a webdriver class within the `selenium.webdriver` module.
-- To run tests using Sauce Labs, set the `remote` option to a key in `regulations.uitests.base_test:remote_configs`, e.g. `--tc=remote:ie11`. Alternatively, run `grunt nose` to run against all configured browsers on Sauce Labs, or `grunt shell:nose-chrome` to run against a single remote browser.
+- The tests run using [py.test](http://docs.pytest.org/en/latest/). If you wish to run the tests outside of the Grunt environment, you may by running ```py.test regulations/uitests/``` from the root of the repo.
+- By default, functional tests run using a local PhantomJS driver. To run using a different local browser, set a `UITESTS_LOCAL` environment variable, e.g. `UITESTS_LOCAL=Chrome`; the option should be a webdriver class within the `selenium.webdriver` module.
+- To run tests using Sauce Labs, set the `UITESTS_REMOTE` env variable to a key in `regulations.uitests.base_test:remote_configs`, e.g. `UITESTS_REMOTE=ie11`.
 
 ##### For unit tests
 - Unit tests do not require running the dummy API.

fr_notices/tests/navigation_tests.py

@@ -2,7 +2,6 @@
 from __future__ import unicode_literals
 from unittest import TestCase
 
-from nose.tools import assert_equal, assert_is_none
 from mock import patch
 
 from fr_notices import navigation
@@ -50,12 +49,12 @@ def test_footer(self):
         toc = navigation.make_preamble_nav(self.nodes)
 
         nav = navigation.footer(toc, [], 'doc_id-preamble-doc_id-I')
-        assert_equal(nav['next'].section_id, 'doc_id-preamble-doc_id-II')
-        assert_is_none(nav['previous'])
+        assert nav['next'].section_id == 'doc_id-preamble-doc_id-II'
+        assert nav['previous'] is None
 
         nav = navigation.footer(toc, [], 'doc_id-preamble-doc_id-II')
-        assert_equal(nav['previous'].section_id, 'doc_id-preamble-doc_id-I')
-        assert_is_none(nav['next'])
+        assert nav['previous'].section_id == 'doc_id-preamble-doc_id-I'
+        assert nav['next'] is None
 
 
 class CFRChangeBuilderTests(TestCase):
@@ -150,13 +149,13 @@ def test_footer(self):
         ]
 
         nav = navigation.footer([], toc, '2016_02749-cfr-478')
-        assert_is_none(nav['previous'])
-        assert_equal(nav['next'].section_id, '2016_02749-cfr-478-99')
+        assert nav['previous'] is None
+        assert nav['next'].section_id == '2016_02749-cfr-478-99'
 
         nav = navigation.footer([], toc, '2016_02749-cfr-478-99')
-        assert_equal(nav['previous'].section_id, '2016_02749-cfr-478')
-        assert_equal(nav['next'].section_id, '2016_02749-cfr-478-120')
+        assert nav['previous'].section_id == '2016_02749-cfr-478'
+        assert nav['next'].section_id == '2016_02749-cfr-478-120'
 
         nav = navigation.footer([], toc, '2016_02749-cfr-478-120')
-        assert_equal(nav['previous'].section_id, '2016_02749-cfr-478-99')
-        assert_is_none(nav['next'])
+        assert nav['previous'].section_id == '2016_02749-cfr-478-99'
+        assert nav['next'] is None

integration-tests.sh

@@ -8,4 +8,6 @@ cd ..
 cp local_settings_test.py local_settings.py
 ./run_server.sh &
 sleep 5
-grunt nose
+export UITESTS_URL=http://localhost:8000
+UITESTS_REMOTE=chrome py.test regulations/uitests -s
+UITESTS_REMOTE=ie11 py.test regulations/uitests -s

regulations/settings/base.py

@@ -170,10 +170,6 @@
 #   Use the 'source' directory; useful for development
 JS_DEBUG = False
 
-# Django by default tries to setup a databse when running tests. We don't have
-# a database, so we override the default test runner.
-TEST_RUNNER = 'regulations.tests.runner.DatabaselessTestRunner'
-
 CACHES = {
     'default': {
         'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache',

regulations/settings/dev.py

@@ -6,16 +6,6 @@
 CACHES['eregs_longterm_cache']['BACKEND'] = 'django.core.cache.backends.dummy.DummyCache'
 CACHES['api_cache']['TIMEOUT'] = 5  # roughly per request
 
-INSTALLED_APPS += (
-    'django_nose',
-)
-
-NOSE_ARGS = [
-    '--with-coverage',
-    '--cover-package=fr_notices,regulations',
-    '--exclude-dir=regulations/uitests'
-]
-
 try:
     from local_settings import *
 except ImportError:

regulations/tests/runner.py

@@ -6,7 +6,6 @@
 from celery.exceptions import Retry, MaxRetriesExceededError
 from django.conf import settings
 from django.test import TestCase, override_settings
-from nose.tools import assert_equal
 from requests.exceptions import RequestException
 
 from regulations.tasks import submit_comment, cache_pdf, SignedUrl
@@ -126,7 +125,7 @@ def test_cache_pdf(self, s3_client, url_generate):
         url_generate.return_value = SignedUrl(
             'pdf', 'https://s3.amazonaws.com/bucket/pdf')
         url = cache_pdf('content', "1234_56", meta)
-        assert_equal(url, url_generate.return_value)
+        assert url == url_generate.return_value
         s3_client.put_object.assert_any_call(
             Body=json.dumps({'pdfUrl': meta.url}),
             Bucket=settings.ATTACHMENT_BUCKET,

regulations/tests/tasks_tests.py

@@ -4,7 +4,6 @@
 from unittest import TestCase
 from datetime import date, timedelta
 
-from nose.tools import assert_equal
 from django.http import Http404
 from django.test import RequestFactory, override_settings
 
@@ -96,7 +95,7 @@ def test_comments_open_from_settings(self, ApiReader):
         """
         _, meta, _ = preamble.notice_data('1')
 
-        assert_equal(meta['comment_state'], CommentState.OPEN)
+        assert meta['comment_state'] == CommentState.OPEN
 
     def _setup_mock_response(self, ApiReader, **kwargs):
         """Mock the ApiReader response, replacing meta data fields with
@@ -124,21 +123,21 @@ def test_comments_open(self, ApiReader):
         future = date.today() + timedelta(days=10)
         self._setup_mock_response(ApiReader, comments_close=future.isoformat())
         _, meta, _ = preamble.notice_data('1')
-        assert_equal(meta['comment_state'], CommentState.OPEN)
+        assert meta['comment_state'] == CommentState.OPEN
 
     @patch('regulations.views.preamble.ApiReader')
     def test_comments_prepub(self, ApiReader):
         future = date.today() + timedelta(days=10)
         self._setup_mock_response(ApiReader,
                                   publication_date=future.isoformat())
         _, meta, _ = preamble.notice_data('1')
-        assert_equal(meta['comment_state'], CommentState.PREPUB)
+        assert meta['comment_state'] == CommentState.PREPUB
 
     @patch('regulations.views.preamble.ApiReader')
     def test_comments_closed(self, ApiReader):
         self._setup_mock_response(ApiReader)
         _, meta, _ = preamble.notice_data('1')
-        assert_equal(meta['comment_state'], CommentState.CLOSED)
+        assert meta['comment_state'] == CommentState.CLOSED
 
     @patch('fr_notices.navigation.CFRChangeBuilder')
     @patch('regulations.generator.generator.api_reader')
@@ -153,8 +152,8 @@ def test_get_top_level_redirect(self, ApiReader, api_reader,
 
         path = '/preamble/1'
         response = view(RequestFactory().get(path), paragraphs='1')
-        assert_equal(response.status_code, 302)
-        assert_equal(response.get('Location'), '/preamble/1/c')
+        assert response.status_code == 302
+        assert response.get('Location') == '/preamble/1/c'
 
     @patch('regulations.views.preamble.ApiReader')
     def test_get_404(self, ApiReader):
@@ -187,7 +186,7 @@ def test_notice_data(self, ApiReader):
         for doc_id in ('123_456', '123-456'):
             preamble_, meta, notice = preamble.notice_data(doc_id)
             self.assertEqual(preamble_, self._mock_preamble)
-            assert_equal(meta['comment_state'], CommentState.CLOSED)
+            assert meta['comment_state'] == CommentState.CLOSED
             self.assertEqual(meta['cfr_refs'],
                              [{'title': 21, 'parts': ['123']}])
             self.assertEqual(ApiReader.return_value.preamble.call_args[0][0],

regulations/tests/views_preamble_tests.py

@@ -1,6 +1,5 @@
 import os
 from selenium import webdriver
-from testconfig import config
 
 
 remote_configs = {
@@ -22,25 +21,25 @@ class BaseTest():
     job_name = 'eRegs UI Test'
 
     def setUp(self):
-        self.test_url = config['testUrl']
+        self.test_url = os.environ['UITESTS_URL']
         self.driver = (
             self.make_remote()
-            if 'remote' in config
+            if 'UITESTS_REMOTE' in os.environ
             else self.make_local()
         )
         self.driver.set_window_size(800, 600)
         self.driver.implicitly_wait(30)
 
     def make_local(self):
-        attr = config.get('local', 'PhantomJS')
+        attr = os.environ.get('UITESTS_LOCAL', 'PhantomJS')
         klass = getattr(webdriver, attr)
         if not isinstance(klass, type):
             raise TypeError(
                 'Option {} did not resolve to a class'.format(attr))
         return klass()
 
     def make_remote(self):
-        selenium_config = remote_configs[config['remote']]
+        selenium_config = remote_configs[os.environ['UITESTS_REMOTE']]
         capabilities = selenium_config['driver']
         if (os.environ.get('TRAVIS')
                 and os.environ.get('TRAVIS_SECURE_ENV_VARS')):