Fix tests on win32

3 files changed, 14 insertions, 14 deletions

diff --git a/pyramid/tests/test_asset.py b/pyramid/tests/test_asset.py
index 494838d59..260e4994e 100644
--- a/pyramid/tests/test_asset.py
+++ b/pyramid/tests/test_asset.py
@@ -40,7 +40,7 @@ class TestOverrideProvider(unittest.TestCase):
         here = os.path.dirname(os.path.abspath(__file__))
         expected = open(os.path.join(here, resource_name)).read()
         result = provider.get_resource_stream(None, resource_name)
-        self.assertEqual(result.read(), expected)
+        self.assertEqual(result.read().replace('\r', ''), expected)
 
     def test_get_resource_string_no_overrides(self):
         import os
@@ -50,7 +50,7 @@ class TestOverrideProvider(unittest.TestCase):
         here = os.path.dirname(os.path.abspath(__file__))
         expected = open(os.path.join(here, resource_name)).read()
         result = provider.get_resource_string(None, resource_name)
-        self.assertEqual(result, expected)
+        self.assertEqual(result.replace('\r', ''), expected)
 
     def test_has_resource_no_overrides(self):
         resource_name = 'test_asset.py'
@@ -276,7 +276,7 @@ class TestPackageOverrides(unittest.TestCase):
         po.overrides= overrides
         here = os.path.dirname(os.path.abspath(__file__))
         expected = open(os.path.join(here, 'test_asset.py')).read()
-        self.assertEqual(po.get_stream('whatever').read(), expected)
+        self.assertEqual(po.get_stream('whatever').read().replace('\r', ''), expected)
         
     def test_get_string(self):
         import os
@@ -287,7 +287,7 @@ class TestPackageOverrides(unittest.TestCase):
         po.overrides= overrides
         here = os.path.dirname(os.path.abspath(__file__))
         expected = open(os.path.join(here, 'test_asset.py')).read()
-        self.assertEqual(po.get_string('whatever'), expected)
+        self.assertEqual(po.get_string('whatever').replace('\r', ''), expected)
         
     def test_has_resource(self):
         overrides = [ DummyOverride(None), DummyOverride(
@@ -434,7 +434,7 @@ class Test_asset_spec_from_abspath(unittest.TestCase):
 
     def test_abspath_startswith_package_path(self):
         import os
-        abspath = os.path.dirname(__file__) + '/fixtureapp'
+        abspath = os.path.join(os.path.dirname(__file__), 'fixtureapp')
         pkg = DummyPackage('pyramid.tests')
         pkg.__file__ = 'file'
         result = self._callFUT(abspath, pkg)
diff --git a/pyramid/tests/test_integration.py b/pyramid/tests/test_integration.py
index 2f010dc77..a504db982 100644
--- a/pyramid/tests/test_integration.py
+++ b/pyramid/tests/test_integration.py
@@ -61,7 +61,7 @@ class TestStaticApp(unittest.TestCase):
         result = staticapp(context, request)
         self.assertEqual(result.status, '200 OK')
         self.assertEqual(
-            result.body,
+            result.body.replace('\r', ''),
             open(os.path.join(here, 'fixtures/minimal.pt'), 'r').read())
 
 class IntegrationBase(unittest.TestCase):
diff --git a/pyramid/tests/test_mako_templating.py b/pyramid/tests/test_mako_templating.py
index bec29fc10..8a03d4b5c 100644
--- a/pyramid/tests/test_mako_templating.py
+++ b/pyramid/tests/test_mako_templating.py
@@ -307,45 +307,45 @@ class TestIntegration(unittest.TestCase):
 
     def test_render(self):
         from pyramid.renderers import render
-        result = render('helloworld.mak', {'a':1})
+        result = render('helloworld.mak', {'a':1}).replace('\r','')
         self.assertEqual(result, u'\nHello föö\n')
 
     def test_render_from_fs(self):
         from pyramid.renderers import render
         self.config.add_settings({'reload_templates': True})
-        result = render('helloworld.mak', {'a':1})
+        result = render('helloworld.mak', {'a':1}).replace('\r','')
         self.assertEqual(result, u'\nHello föö\n')
     
     def test_render_inheritance(self):
         from pyramid.renderers import render
-        result = render('helloinherit.mak', {})
+        result = render('helloinherit.mak', {}).replace('\r','')
         self.assertEqual(result, u'Layout\nHello World!\n')
 
     def test_render_inheritance_pkg_spec(self):
         from pyramid.renderers import render
-        result = render('hello_inherit_pkg.mak', {})
+        result = render('hello_inherit_pkg.mak', {}).replace('\r','')
         self.assertEqual(result, u'Layout\nHello World!\n')
 
     def test_render_to_response(self):
         from pyramid.renderers import render_to_response
         result = render_to_response('helloworld.mak', {'a':1})
-        self.assertEqual(result.ubody, u'\nHello föö\n')
+        self.assertEqual(result.ubody.replace('\r',''), u'\nHello föö\n')
 
     def test_render_to_response_pkg_spec(self):
         from pyramid.renderers import render_to_response
         result = render_to_response('pyramid.tests:fixtures/helloworld.mak',
                                     {'a':1})
-        self.assertEqual(result.ubody, u'\nHello föö\n')
+        self.assertEqual(result.ubody.replace('\r', ''), u'\nHello föö\n')
     
     def test_render_with_abs_path(self):
         from pyramid.renderers import render
-        result = render('/helloworld.mak', {'a':1})
+        result = render('/helloworld.mak', {'a':1}).replace('\r','')
         self.assertEqual(result, u'\nHello föö\n')
 
     def test_get_renderer(self):
         from pyramid.renderers import get_renderer
         result = get_renderer('helloworld.mak')
-        self.assertEqual(result.implementation().render_unicode(),
+        self.assertEqual(result.implementation().render_unicode().replace('\r',''),
                          u'\nHello föö\n')
     
     def test_template_not_found(self):