Replace nose with pytest

Author: mwilliamson

examples/examples.py

@@ -1,53 +1,44 @@
 import os
 import collections
 
-from nose.tools import istest
-
 if os.environ.get("HAMCREST"):
     from hamcrest import *
 else:
     from precisely.hamcrest import *
 
 
-User = collections.namedtuple("User", ["username", "email_address"]) 
+User = collections.namedtuple("User", ["username", "email_address"])
 
 
-@istest
 def test_anything():
     assert_that(1, anything())
 
-@istest
 def test_equal_to():
     assert_that(1, equal_to(2))
 
 
-@istest
 def test_has_property_wrong_value():
     assert_that(User("bob", None), has_property("username", "bobbity"))
 
 
-@istest
 def test_has_property_missing():
     assert_that("bob", has_property("username", "bobbity"))
 
 
-@istest
 def test_has_properties_wrong_value():
     assert_that(User("bob", "[email protected]"), has_properties(
         username="bob",
         email_address="[email protected]",
     ))
 
 
-@istest
 def test_all_of():
     assert_that(User("bob", "[email protected]"), all_of(
         has_property("username", "bob"),
         has_property("email_address", "[email protected]"),
     ))
 
 
-@istest
 def test_contains_inanyorder_missing_elements():
     assert_that(
         [
@@ -61,7 +52,6 @@ def test_contains_inanyorder_missing_elements():
     )
 
 
-@istest
 def test_contains_inanyorder_extra_elements():
     assert_that(
         ["apple", "banana"],
@@ -70,7 +60,6 @@ def test_contains_inanyorder_extra_elements():
 
 
 
-@istest
 def test_contains_missing_elements():
     assert_that(
         [

makefile

@@ -1,7 +1,7 @@
 .PHONY: test upload clean bootstrap
 
 test:
-	sh -c '. _virtualenv/bin/activate; nosetests tests'
+	sh -c '. _virtualenv/bin/activate; py.test tests'
 	_virtualenv/bin/pyflakes precisely tests
 
 test-all:
@@ -10,22 +10,22 @@ test-all:
 upload: test-all
 	python setup.py sdist bdist_wheel upload
 	make clean
-	
+
 register:
 	python setup.py register
 
 clean:
 	rm -f MANIFEST
 	rm -rf dist
-	
+
 bootstrap: _virtualenv
 	_virtualenv/bin/pip install -e .
-ifneq ($(wildcard test-requirements.txt),) 
+ifneq ($(wildcard test-requirements.txt),)
 	_virtualenv/bin/pip install -r test-requirements.txt
 endif
 	make clean
 
-_virtualenv: 
+_virtualenv:
 	python3 -m venv _virtualenv
 	_virtualenv/bin/pip install --upgrade pip
 	_virtualenv/bin/pip install --upgrade setuptools

test-requirements.txt

@@ -1,3 +1,3 @@
-nose>1,<2
+pytest
 PyHamcrest==1.9.0
 pyflakes==2.2.0

tests/__init__.py

@@ -1,28 +1,24 @@
-from nose.tools import istest, assert_equal
-
 from precisely import all_elements, equal_to
 from precisely.results import matched, unmatched
+from .testing import assert_equal
 
 
-@istest
-def matches_when_all_items_in_iterable_match():
+def test_matches_when_all_items_in_iterable_match():
     matcher = all_elements(equal_to("apple"))
 
     assert_equal(matched(), matcher.match(["apple", "apple"]))
 
 
-@istest
-def mismatches_when_actual_is_not_iterable():
+def test_mismatches_when_actual_is_not_iterable():
     matcher = all_elements(equal_to("apple"))
-    
+
     assert_equal(
         unmatched("was not iterable\nwas 0"),
         matcher.match(0)
     )
 
 
-@istest
-def mismatches_when_item_in_iterable_does_not_match():
+def test_mismatches_when_item_in_iterable_does_not_match():
     matcher = all_elements(equal_to("apple"))
 
     assert_equal(
@@ -31,15 +27,13 @@ def mismatches_when_item_in_iterable_does_not_match():
     )
 
 
-@istest
-def matches_when_iterable_is_empty():
+def test_matches_when_iterable_is_empty():
     matcher = all_elements(equal_to("apple"))
 
     assert_equal(matched(), matcher.match([]))
 
 
-@istest
-def description_contains_descriptions_of_submatcher():
+def test_description_contains_descriptions_of_submatcher():
     matcher = all_elements(equal_to("apple"))
 
     assert_equal(

tests/all_elements_tests.py

@@ -1,43 +1,39 @@
 import collections
 
-from nose.tools import istest, assert_equal
-
 from precisely import all_of, has_attr, equal_to
 from precisely.results import matched, unmatched
+from .testing import assert_equal
 
 
 User = collections.namedtuple("User", ["username", "email_address"])
 
-@istest
-def matches_when_submatchers_all_match():
+def test_matches_when_submatchers_all_match():
     matcher = all_of(
         has_attr("username", equal_to("bob")),
         has_attr("email_address", equal_to("[email protected]")),
     )
-    
+
     assert_equal(matched(), matcher.match(User("bob", "[email protected]")))
 
 
-@istest
-def mismatches_when_submatcher_mismatches():
+def test_mismatches_when_submatcher_mismatches():
     matcher = all_of(
         has_attr("username", equal_to("bob")),
         has_attr("email_address", equal_to("[email protected]")),
     )
-    
+
     assert_equal(
         unmatched("was missing attribute username"),
         matcher.match("bobbity")
     )
 
 
-@istest
-def description_contains_descriptions_of_submatchers():
+def test_description_contains_descriptions_of_submatchers():
     matcher = all_of(
         has_attr("username", equal_to("bob")),
         has_attr("email_address", equal_to("[email protected]")),
     )
-    
+
     assert_equal(
         "all of:\n * object with attribute username: 'bob'\n * object with attribute email_address: '[email protected]'",
         matcher.describe()

tests/all_of_tests.py

@@ -1,56 +1,51 @@
 import collections
 
-from nose.tools import istest, assert_equal
-
 from precisely import any_of, has_attr, equal_to
 from precisely.results import matched, unmatched
+from .testing import assert_equal
 
 
 User = collections.namedtuple("User", ["username", "email_address"])
 
-@istest
-def matches_when_submatchers_all_match():
+def test_matches_when_submatchers_all_match():
     matcher = any_of(
         has_attr("username", equal_to("bob")),
         has_attr("email_address", equal_to("[email protected]")),
     )
-    
+
     assert_equal(matched(), matcher.match(User("bob", "[email protected]")))
 
 
-@istest
-def matches_when_any_submatchers_match():
+def test_matches_when_any_submatchers_match():
     matcher = any_of(
         equal_to("bob"),
         equal_to("jim"),
     )
-    
+
     assert_equal(
         matched(),
         matcher.match("bob"),
     )
 
 
-@istest
-def mismatches_when_no_submatchers_match():
+def test_mismatches_when_no_submatchers_match():
     matcher = any_of(
         equal_to("bob"),
         equal_to("jim"),
     )
-    
+
     assert_equal(
         unmatched("did not match any of:\n * 'bob' [was 'alice']\n * 'jim' [was 'alice']"),
         matcher.match("alice"),
     )
 
 
-@istest
-def description_contains_descriptions_of_submatchers():
+def test_description_contains_descriptions_of_submatchers():
     matcher = any_of(
         has_attr("username", equal_to("bob")),
         has_attr("email_address", equal_to("[email protected]")),
     )
-    
+
     assert_equal(
         "any of:\n * object with attribute username: 'bob'\n * object with attribute email_address: '[email protected]'",
         matcher.describe()

tests/any_of_tests.py

@@ -1,17 +1,14 @@
-from nose.tools import istest, assert_equal
-
 from precisely import anything
 from precisely.results import matched
+from .testing import assert_equal
 
 
-@istest
-def matches_anything():
+def test_matches_anything():
     assert_equal(matched(), anything.match(4))
     assert_equal(matched(), anything.match(None))
     assert_equal(matched(), anything.match("Hello"))
 
 
-@istest
-def description_is_anything():
+def test_description_is_anything():
     assert_equal("anything", anything.describe())
 

tests/anything_tests.py

@@ -1,15 +1,12 @@
-from nose.tools import istest, assert_equal
-
 from precisely import assert_that, equal_to
+from .testing import assert_equal
 
 
-@istest
-def assert_that_does_nothing_if_matcher_matches():
+def test_assert_that_does_nothing_if_matcher_matches():
     assert_that(1, equal_to(1))
 
 
-@istest
-def assert_that_raises_assertion_error_if_match_fails():
+def test_assert_that_raises_assertion_error_if_match_fails():
     try:
         assert_that(1, equal_to(2))
         assert False, "Expected AssertionError"

tests/assert_that_tests.py

@@ -1,13 +1,11 @@
 import functools
 
-from nose.tools import istest, assert_equal
-
 from precisely import close_to, is_sequence
 from precisely.results import matched, unmatched
+from .testing import assert_equal
 
 
-@istest
-def close_to_matches_when_actual_is_close_to_value_plus_delta():
+def test_close_to_matches_when_actual_is_close_to_value_plus_delta():
     matcher = close_to(42, 1)
     assert_equal(matched(), matcher.match(43))
     assert_equal(matched(), matcher.match(42.5))
@@ -17,8 +15,7 @@ def close_to_matches_when_actual_is_close_to_value_plus_delta():
     assert_equal(unmatched("was 40 (2 away from 42)"), matcher.match(40))
 
 
-@istest
-def close_to_matches_any_types_supporting_comparison_and_addition_and_subtraction():
+def test_close_to_matches_any_types_supporting_comparison_and_addition_and_subtraction():
     class Instant(object):
         def __init__(self, seconds_since_epoch):
             self.seconds_since_epoch = seconds_since_epoch
@@ -64,13 +61,11 @@ def __repr__(self):
     assert_equal(unmatched("was Instant(40) (Interval(2) away from Instant(42))"), matcher.match(Instant(40)))
 
 
-@istest
-def close_to_description_describes_value():
+def test_close_to_description_describes_value():
     matcher = close_to(42, 1)
     assert_equal("close to 42 +/- 1", matcher.describe())
 
 
-@istest
-def close_to_can_be_used_in_composite_matcher():
+def test_close_to_can_be_used_in_composite_matcher():
     matcher = is_sequence("a", "b", close_to(42, 1))
     assert_equal(matched(), matcher.match(("a", "b", 42)))