summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-08-28 07:15:00 -0400
committerChris McDonough <chrism@plope.com>2011-08-28 07:15:00 -0400
commitf4bf6e5c6e09d8c934ccc0389824bd356b663e76 (patch)
treee18554e7229ba4832bbd122447ea7d693a67c889
parent50983e35f2824128fbc4f818d8996b009214052c (diff)
downloadpyramid-f4bf6e5c6e09d8c934ccc0389824bd356b663e76.tar.gz
pyramid-f4bf6e5c6e09d8c934ccc0389824bd356b663e76.tar.bz2
pyramid-f4bf6e5c6e09d8c934ccc0389824bd356b663e76.zip
skip renderer scan app integration test on java (uses chameleon)
-rw-r--r--pyramid/tests/test_integration.py39
1 files changed, 20 insertions, 19 deletions
diff --git a/pyramid/tests/test_integration.py b/pyramid/tests/test_integration.py
index a8326f848..f42e6425d 100644
--- a/pyramid/tests/test_integration.py
+++ b/pyramid/tests/test_integration.py
@@ -471,25 +471,26 @@ class WSGIApp2AppTest(unittest.TestCase):
res = self.testapp.get('/hello', status=200)
self.assertTrue('Hello' in res.body)
-class RendererScanAppTest(IntegrationBase):
- package = 'pyramid.tests.rendererscanapp'
- def test_root(self):
- res = self.testapp.get('/one', status=200)
- self.assertTrue('One!' in res.body)
-
- def test_two(self):
- res = self.testapp.get('/two', status=200)
- self.assertTrue('Two!' in res.body)
-
- def test_rescan(self):
- self.config.scan('pyramid.tests.rendererscanapp')
- app = self.config.make_wsgi_app()
- from webtest import TestApp
- testapp = TestApp(app)
- res = testapp.get('/one', status=200)
- self.assertTrue('One!' in res.body)
- res = testapp.get('/two', status=200)
- self.assertTrue('Two!' in res.body)
+if os.name != 'java': # uses chameleon
+ class RendererScanAppTest(IntegrationBase):
+ package = 'pyramid.tests.rendererscanapp'
+ def test_root(self):
+ res = self.testapp.get('/one', status=200)
+ self.assertTrue('One!' in res.body)
+
+ def test_two(self):
+ res = self.testapp.get('/two', status=200)
+ self.assertTrue('Two!' in res.body)
+
+ def test_rescan(self):
+ self.config.scan('pyramid.tests.rendererscanapp')
+ app = self.config.make_wsgi_app()
+ from webtest import TestApp
+ testapp = TestApp(app)
+ res = testapp.get('/one', status=200)
+ self.assertTrue('One!' in res.body)
+ res = testapp.get('/two', status=200)
+ self.assertTrue('Two!' in res.body)
class DummyContext(object):
pass