Merge branch 'master' into pr/3034

Michael Merickel

2017-06-18 75c30dfe18b26ca04efae2acbe35052fa0d93ed6

 pyramid/tests/test_config/test_util.py

@@ -365,6 +365,16 @@
        from pyramid.exceptions import ConfigurationError
        self.assertRaises(ConfigurationError, self._callFUT, unknown=1)

    def test_predicate_close_matches(self):
        from pyramid.exceptions import ConfigurationError
        with  self.assertRaises(ConfigurationError) as context:
            self._callFUT(method='GET')
        expected_msg = (
            "Unknown predicate values: {'method': 'GET'} "
            "(did you mean request_method)"
        )
        self.assertEqual(context.exception.args[0], expected_msg)

    def test_notted(self):
        from pyramid.config import not_
        from pyramid.testing import DummyRequest