Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix test failures on pypy #3320

Merged
merged 11 commits into from
Aug 2, 2018
Merged

Fix test failures on pypy #3320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3e9a737
Merge branch 'master' of github.com:Pylons/pyramid
mcdonc Jun 1, 2016
88d40ca
Merge branch 'master' of github.com:Pylons/pyramid
mcdonc Jun 3, 2016
d350714
Merge branch 'master' of github.com:Pylons/pyramid
mcdonc Jun 30, 2016
85bd2b8
Merge branch 'master' of github.com:Pylons/pyramid
mcdonc Sep 14, 2016
7bb06f2
Merge branch 'master' of github.com:Pylons/pyramid
mcdonc Oct 22, 2016
b2e8884
Merge branch 'master' of github.com:Pylons/pyramid
mcdonc Feb 18, 2017
bf59bd8
Merge branch 'master' of github.com:Pylons/pyramid
mcdonc Mar 13, 2018
f9c30f5
Merge branch 'master' of github.com:Pylons/pyramid
mcdonc Apr 17, 2018
50efc32
Merge branch 'master' of github.com:Pylons/pyramid
mcdonc Apr 24, 2018
0c8ca23
Merge branch 'master' of github.com:Pylons/pyramid
mcdonc Jul 2, 2018
527e599
ignore these tests on pypy, see https://github.com/Pylons/pyramid/iss…
mcdonc Aug 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions pyramid/tests/test_events.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,7 @@ def _makeOne(self, system, val=None):
from pyramid.events import BeforeRender
return BeforeRender(system, val)

@testing.skip_on('pypy') # see https://github.com/Pylons/pyramid/issues/3237
def test_instance_conforms(self):
from zope.interface.verify import verifyObject
from pyramid.interfaces import IBeforeRender
Expand Down
2 changes: 2 additions & 0 deletions pyramid/tests/test_testing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import unittest
from zope.component import getSiteManager
from pyramid import testing

class TestDummyRootFactory(unittest.TestCase):
def _makeOne(self, environ):
Expand Down Expand Up @@ -526,6 +527,7 @@ def _makeOne(self):
from pyramid.testing import DummySession
return DummySession()

@testing.skip_on('pypy') # see https://github.com/Pylons/pyramid/issues/3237
def test_instance_conforms(self):
from zope.interface.verify import verifyObject
from pyramid.interfaces import ISession
Expand Down