summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-02-28 22:02:09 -0500
committerChris McDonough <chrism@plope.com>2012-02-28 22:02:09 -0500
commit54105d4f39cb411641ffca91cc021e69e634b928 (patch)
tree8c37da7b51fb09767bba0919159f6603d356f3ee
parentbb388112f92943f8047ec40f74c90790b162f46d (diff)
downloadpyramid-54105d4f39cb411641ffca91cc021e69e634b928.tar.gz
pyramid-54105d4f39cb411641ffca91cc021e69e634b928.tar.bz2
pyramid-54105d4f39cb411641ffca91cc021e69e634b928.zip
prevent highorder tests from running on non-Linux platforms (these seem to have issues)
-rw-r--r--pyramid/tests/test_integration.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/pyramid/tests/test_integration.py b/pyramid/tests/test_integration.py
index 89b485b76..590ba0760 100644
--- a/pyramid/tests/test_integration.py
+++ b/pyramid/tests/test_integration.py
@@ -3,6 +3,7 @@
import datetime
import locale
import os
+import platform
import unittest
from pyramid.wsgi import wsgiapp
@@ -81,8 +82,10 @@ class TestStaticAppBase(IntegrationBase):
res = self.testapp.get('/static/.hiddenfile', status=200)
_assertBody(res.body, os.path.join(here, 'fixtures/static/.hiddenfile'))
- if defaultlocale is not None:
- # These tests are expected to fail on LANG=C systems
+ if defaultlocale is not None and platform.system() == 'Linux':
+ # These tests are expected to fail on LANG=C systems due to decode
+ # errors and on non-Linux systems due to git highchar handling
+ # vagaries
def test_highchars_in_pathelement(self):
url = url_quote('/static/héhé/index.html')
res = self.testapp.get(url, status=200)