Michael Merickel
2013-03-19 38f63802cff9811f2575a8458c54455400519b4a
remove files with higher order characters from the repo and fix tests

the 2 tests that use these files now generate them on the fly, this
should work on non-linux systems
2 files deleted
1 files modified
47 ■■■■■ changed files
pyramid/tests/fixtures/static/héhé.html 1 ●●●● patch | view | raw | blame | history
pyramid/tests/fixtures/static/héhé/index.html 1 ●●●● patch | view | raw | blame | history
pyramid/tests/test_integration.py 45 ●●●●● patch | view | raw | blame | history
pyramid/tests/fixtures/static/h?h?.html
File was deleted
pyramid/tests/fixtures/static/h?h?/index.html
File was deleted
pyramid/tests/test_integration.py
@@ -3,7 +3,6 @@
import datetime
import locale
import os
import platform
import unittest
from pyramid.wsgi import wsgiapp
@@ -82,27 +81,40 @@
        res = self.testapp.get('/static/.hiddenfile', status=200)
        _assertBody(res.body, os.path.join(here, 'fixtures/static/.hiddenfile'))
    if defaultlocale is not None and platform.system() == 'Linux':
    if defaultlocale is not None:
        # 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)
            _assertBody(
                res.body,
                os.path.join(here,
                             text_('fixtures/static/héhé/index.html', 'utf-8'))
                )
            path = os.path.join(
                here,
                text_('fixtures/static/héhé/index.html', 'utf-8'))
            pathdir = os.path.dirname(path)
            body = b'<html>hehe</html>\n'
            try:
                os.makedirs(pathdir)
                with open(path, 'wb') as fp:
                    fp.write(body)
                url = url_quote('/static/héhé/index.html')
                res = self.testapp.get(url, status=200)
                self.assertEqual(res.body, body)
            finally:
                os.unlink(path)
                os.rmdir(pathdir)
        def test_highchars_in_filename(self):
            url = url_quote('/static/héhé.html')
            res = self.testapp.get(url, status=200)
            _assertBody(
                res.body,
                os.path.join(here,
                             text_('fixtures/static/héhé.html', 'utf-8'))
                )
            path = os.path.join(
                here,
                text_('fixtures/static/héhé.html', 'utf-8'))
            body = b'<html>hehe file</html>\n'
            with open(path, 'wb') as fp:
                fp.write(body)
            try:
                url = url_quote('/static/héhé.html')
                res = self.testapp.get(url, status=200)
                self.assertEqual(res.body, body)
            finally:
                os.unlink(path)
    def test_not_modified(self):
        self.testapp.extra_environ = {
@@ -663,4 +675,3 @@
    data = data.replace(b'\r', b'')
    data = data.replace(b'\n', b'')
    assert(body == data)