Merge pull request #539 from bnavigator/remove-nose

remove nose and extra mock

Author: miracle2k

requirements-dev.pip

@@ -6,8 +6,7 @@
 #
 # Libs required to run the tests
 pytest
-nose
-mock
+mock;python_version<"3.3"
 
 # Libs helpful during development
 Sphinx

tests/helpers.py

@@ -5,36 +5,17 @@
 
 
 __all__ = ('TempDirHelper', 'TempEnvironmentHelper', 'noop',
-           'assert_raises_regexp', 'check_warnings')
+           'assert_raises_regex', 'check_warnings')
 
 
 # Define a noop filter; occasionally in tests we need to define
 # a filter to be able to test a certain piece of functionality,.
 noop = lambda _in, out: out.write(_in.read())
 
 
-try:
-    # Python 3
-    from nose.tools import assert_raises_regex
-except ImportError:
-    try:
-        # Python >= 2.7
-        from nose.tools import assert_raises_regexp as assert_raises_regex
-    except:
-        # Python < 2.7
-        def assert_raises_regex(expected, regexp, callable, *a, **kw):
-            try:
-                callable(*a, **kw)
-            except expected as e:
-                if isinstance(regexp, basestring):
-                    regexp = re.compile(regexp)
-                if not regexp.search(str(e.message)):
-                    raise self.failureException('"%s" does not match "%s"' %
-                             (regexp.pattern, str(e.message)))
-            else:
-                if hasattr(expected,'__name__'): excName = expected.__name__
-                else: excName = str(expected)
-                raise AssertionError("%s not raised" % excName)
+from pytest import raises
+def assert_raises_regex(expected, regexp, callable, *a, **kw):
+    raises(expected, callable, *a, **kw).match(regexp)
 
 
 try:

tests/test_bundle_build.py

@@ -6,8 +6,10 @@
 
 
 import os
-from nose.tools import assert_raises
+
+from pytest import raises as assert_raises
 import pytest
+
 from webassets import Bundle
 from webassets.cache import MemoryCache
 from webassets.exceptions import BuildError, BundleError

tests/test_bundle_urls.py

@@ -6,8 +6,9 @@
 
 from __future__ import with_statement
 
-from nose import SkipTest
-from nose.tools import assert_raises, assert_equal
+import re
+
+import pytest
 
 from tests.test_bundle_build import AppendFilter
 from webassets import Bundle
@@ -64,12 +65,12 @@ def test_erroneous_debug_value(self):
         value."""
         # On the bundle level
         b = self.MockBundle('a', 'b', debug="invalid")
-        assert_raises(BundleError, b.urls, env=self.env)
+        pytest.raises(BundleError, b.urls, env=self.env)
 
         # On the environment level
         self.env.debug = "invalid"
         b = self.MockBundle('a', 'b')
-        assert_raises(BundleError, b.urls, env=self.env)
+        pytest.raises(BundleError, b.urls, env=self.env)
 
         # Self-check - this should work if this test works.
         self.env.debug = True  # valid again
@@ -96,7 +97,7 @@ def test_invalid_source_file(self):
         """
         self.env.debug = True
         bundle = self.mkbundle('non-existent-file', output="out")
-        assert_raises(BundleError, bundle.urls)
+        pytest.raises(BundleError, bundle.urls)
 
     def test_filters_in_debug_mode(self):
         """Test that if a filter is used which runs in debug mode, the bundle
@@ -124,33 +125,25 @@ def test_external_refs(self):
         """If a bundle contains absolute paths outside of the
         media directory, to generate a url they are copied in.
         """
-        try:
-            from nose.tools import assert_regex
-        except ImportError:
-            raise SkipTest("Assertion method only present in 2.7+")
         self.env.debug = True
         with TempDirHelper() as h:
             h.create_files(['foo.css'])
             bundle = self.mkbundle(h.path('foo.css'))
             urls = bundle.urls()
             assert len(urls) == 1
-            assert_regex(urls[0], r'.*/webassets-external/[\da-z]*_foo.css')
+            assert re.match(r'.*/webassets-external/[\da-z]*_foo.css', urls[0])
 
     def test_external_refs_calculate_sri(self):
         """If a bundle contains absolute paths outside of the
         media directory, to generate a url they are copied in.
         """
-        try:
-            from nose.tools import assert_regex
-        except ImportError:
-            raise SkipTest("Assertion method only present in 2.7+")
         self.env.debug = True
         with TempDirHelper() as h:
             h.create_files(['foo.css'])
             bundle = self.mkbundle(h.path('foo.css'))
             urls = bundle.urls(calculate_sri=True)
             assert len(urls) == 1
-            assert_regex(urls[0]['uri'], r'.*/webassets-external/[\da-z]*_foo.css')
+            assert re.match(r'.*/webassets-external/[\da-z]*_foo.css', urls[0]['uri'])
             assert urls[0]['sri'] == _EMPTY_FILE_SRI
 
 
@@ -194,7 +187,7 @@ def test_root_bundle_switching_to_merge(self):
         does not affect url generation).
         """
         bundle = self.MockBundle('1', '2', output='childout', debug='merge')
-        assert_equal(bundle.urls(), ['/childout'])
+        assert bundle.urls() == ['/childout']
         assert len(self.build_called) == 1
 
     def test_root_bundle_switching_to_debug_true(self):
@@ -203,7 +196,7 @@ def test_root_bundle_switching_to_debug_true(self):
         ineffectual.
         """
         bundle = self.MockBundle('1', '2', output='childout', debug=True)
-        assert_equal(bundle.urls(), ['/childout'])
+        assert bundle.urls() == ['/childout']
         assert len(self.build_called) == 1
 
     def test_root_debug_true_and_child_debug_false(self):
@@ -217,7 +210,7 @@ def test_root_debug_true_and_child_debug_false(self):
             '1', '2',
             self.MockBundle('a', output='child1', debug=False),
             output='rootout', debug=True)
-        assert_equal(bundle.urls(), ['/rootout'])
+        assert bundle.urls() == ['/rootout']
 
     def test_simple_bundle_with_sri(self):
         bundle = self.MockBundle('a', 'b', 'c', output='out')
@@ -259,7 +252,7 @@ def test_root_bundle_switching_to_merge_with_sri(self):
         does not affect url generation).
         """
         bundle = self.MockBundle('1', '2', output='childout', debug='merge')
-        assert_equal(bundle.urls(calculate_sri=True), [{'uri': '/childout', 'sri': None}])
+        assert bundle.urls(calculate_sri=True) == [{'uri': '/childout', 'sri': None}]
         assert len(self.build_called) == 1
 
     def test_root_bundle_switching_to_debug_true_with_sri(self):
@@ -268,7 +261,7 @@ def test_root_bundle_switching_to_debug_true_with_sri(self):
         ineffectual.
         """
         bundle = self.MockBundle('1', '2', output='childout', debug=True)
-        assert_equal(bundle.urls(calculate_sri=True), [{'uri': '/childout', 'sri': None}])
+        assert bundle.urls(calculate_sri=True) == [{'uri': '/childout', 'sri': None}]
         assert len(self.build_called) == 1
 
     def test_root_debug_true_and_child_debug_false_with_sri(self):
@@ -282,7 +275,7 @@ def test_root_debug_true_and_child_debug_false_with_sri(self):
             '1', '2',
             self.MockBundle('a', output='child1', debug=False),
             output='rootout', debug=True)
-        assert_equal(bundle.urls(calculate_sri=True), [{'uri': '/rootout', 'sri': None}])
+        assert bundle.urls(calculate_sri=True) == [{'uri': '/rootout', 'sri': None}]
 
 
 class TestUrlsWithDebugTrue(BaseUrlsTester):
@@ -295,8 +288,8 @@ def setup(self):
 
     def test_simple_bundle(self):
         bundle = self.MockBundle('a', 'b', 'c', output='out')
-        assert_equal(bundle.urls(), ['/a', '/b', '/c'])
-        assert_equal(len(self.build_called), 0)
+        assert bundle.urls() == ['/a', '/b', '/c']
+        assert len(self.build_called) == 0
 
     def test_nested_bundle(self):
         bundle = self.MockBundle(
@@ -318,8 +311,8 @@ def test_url_source(self):
         """[Regression] Test a Bundle that contains a source URL.
         """
         bundle = self.MockBundle('http://test.de', output='out')
-        assert_equal(bundle.urls(), ['http://test.de'])
-        assert_equal(len(self.build_called), 0)
+        assert bundle.urls() == ['http://test.de']
+        assert len(self.build_called) == 0
 
         # This is the important test. It proves that the url source
         # was handled separately, and not processed like any other
@@ -328,22 +321,22 @@ def test_url_source(self):
         # converts a bundle content into an url operates just fine
         # on a url source, so there is no easy other way to determine
         # whether the url source was treated special.
-        assert_equal(len(self.makeurl_called), 0)
+        assert len(self.makeurl_called) == 0
 
     def test_root_bundle_switching_to_debug_false(self):
         """A bundle explicitly says it wants to be processed with
         debug=False, overriding the global "debug=True" setting.
         """
         bundle = self.MockBundle('1', '2', output='childout', debug=False)
-        assert_equal(bundle.urls(), ['/childout'])
+        assert bundle.urls() == ['/childout']
         assert len(self.build_called) == 1
 
     def test_root_bundle_switching_to_merge(self):
         """A bundle explicitly says it wants to be merged, overriding
         the global "debug=True" setting.
         """
         bundle = self.MockBundle('1', '2', output='childout', debug='merge')
-        assert_equal(bundle.urls(), ['/childout'])
+        assert bundle.urls() == ['/childout']
         assert len(self.build_called) == 1
 
     def test_child_bundle_switching(self):
@@ -354,16 +347,16 @@ def test_child_bundle_switching(self):
         bundle = self.MockBundle(
             'a', self.MockBundle('1', '2', output='childout', debug='merge'),
             'c', output='out')
-        assert_equal(bundle.urls(), ['/a', '/childout', '/c'])
+        assert bundle.urls() == ['/a', '/childout', '/c']
         assert len(self.build_called) == 1
 
     def test_simple_bundle_with_sri(self):
         bundle = self.MockBundle('a', 'b', 'c', output='out')
-        assert_equal(bundle.urls(calculate_sri=True),
-                     [{'sri': _EMPTY_FILE_SRI, 'uri': '/a'},
+        assert bundle.urls(calculate_sri=True) == [
+                      {'sri': _EMPTY_FILE_SRI, 'uri': '/a'},
                       {'sri': _EMPTY_FILE_SRI, 'uri': '/b'},
-                      {'sri': _EMPTY_FILE_SRI, 'uri': '/c'}])
-        assert_equal(len(self.build_called), 0)
+                      {'sri': _EMPTY_FILE_SRI, 'uri': '/c'}]
+        assert len(self.build_called) == 0
 
     def test_nested_bundle_with_sri(self):
         bundle = self.MockBundle(
@@ -389,8 +382,8 @@ def test_url_source_with_sri(self):
         """[Regression] Test a Bundle that contains a source URL.
         """
         bundle = self.MockBundle('http://test.de', output='out')
-        assert_equal(bundle.urls(calculate_sri=True), [{'sri': None, 'uri': 'http://test.de'}])
-        assert_equal(len(self.build_called), 0)
+        assert bundle.urls(calculate_sri=True) == [{'sri': None, 'uri': 'http://test.de'}]
+        assert len(self.build_called) == 0
 
         # This is the important test. It proves that the url source
         # was handled separately, and not processed like any other
@@ -399,22 +392,22 @@ def test_url_source_with_sri(self):
         # converts a bundle content into an url operates just fine
         # on a url source, so there is no easy other way to determine
         # whether the url source was treated special.
-        assert_equal(len(self.makeurl_called), 0)
+        assert len(self.makeurl_called) == 0
 
     def test_root_bundle_switching_to_debug_false_with_sri(self):
         """A bundle explicitly says it wants to be processed with
         debug=False, overriding the global "debug=True" setting.
         """
         bundle = self.MockBundle('1', '2', output='childout', debug=False)
-        assert_equal(bundle.urls(calculate_sri=True), [{'sri': None, 'uri': '/childout'}])
+        assert bundle.urls(calculate_sri=True) == [{'sri': None, 'uri': '/childout'}]
         assert len(self.build_called) == 1
 
     def test_root_bundle_switching_to_merge_with_sri(self):
         """A bundle explicitly says it wants to be merged, overriding
         the global "debug=True" setting.
         """
         bundle = self.MockBundle('1', '2', output='childout', debug='merge')
-        assert_equal(bundle.urls(calculate_sri=True), [{'sri': None, 'uri': '/childout'}])
+        assert bundle.urls(calculate_sri=True) == [{'sri': None, 'uri': '/childout'}]
         assert len(self.build_called) == 1
 
     def test_child_bundle_switching_with_sri(self):
@@ -425,10 +418,10 @@ def test_child_bundle_switching_with_sri(self):
         bundle = self.MockBundle(
             'a', self.MockBundle('1', '2', output='childout', debug='merge'),
             'c', output='out')
-        assert_equal(bundle.urls(calculate_sri=True),
-                     [{'sri': _EMPTY_FILE_SRI, 'uri': '/a'},
+        assert bundle.urls(calculate_sri=True) == [
+                      {'sri': _EMPTY_FILE_SRI, 'uri': '/a'},
                       {'sri': None, 'uri': '/childout'},
-                      {'sri': _EMPTY_FILE_SRI, 'uri': '/c'}])
+                      {'sri': _EMPTY_FILE_SRI, 'uri': '/c'}]
         assert len(self.build_called) == 1
 
 
@@ -457,7 +450,7 @@ def test_child_bundle_switching_to_debug_false(self):
         bundle = self.MockBundle(
             'a', self.MockBundle('1', '2', output='childout', debug=False),
             'c', output='out')
-        assert_equal(bundle.urls(), ['/out'])
+        assert bundle.urls() == ['/out']
         assert len(self.build_called) == 1
 
     def test_root_bundle_switching_to_debug_true(self):
@@ -467,7 +460,7 @@ def test_root_bundle_switching_to_debug_true(self):
         bundle = self.MockBundle(
             'a', self.MockBundle('1', '2', output='childout', debug=True),
             'c', output='out')
-        assert_equal(bundle.urls(), ['/out'])
+        assert bundle.urls() == ['/out']
         assert len(self.build_called) == 1
 
     def test_simple_bundle_with_sri(self):
@@ -489,7 +482,7 @@ def test_child_bundle_switching_to_debug_false_with_sri(self):
         bundle = self.MockBundle(
             'a', self.MockBundle('1', '2', output='childout', debug=False),
             'c', output='out')
-        assert_equal(bundle.urls(calculate_sri=True), [{'sri': None, 'uri': '/out'}])
+        assert bundle.urls(calculate_sri=True) == [{'sri': None, 'uri': '/out'}]
         assert len(self.build_called) == 1
 
     def test_root_bundle_switching_to_debug_true_with_sri(self):
@@ -499,5 +492,5 @@ def test_root_bundle_switching_to_debug_true_with_sri(self):
         bundle = self.MockBundle(
             'a', self.MockBundle('1', '2', output='childout', debug=True),
             'c', output='out')
-        assert_equal(bundle.urls(calculate_sri=True), [{'sri': None, 'uri': '/out'}])
+        assert bundle.urls(calculate_sri=True) == [{'sri': None, 'uri': '/out'}]
         assert len(self.build_called) == 1