[Checkins] SVN: five.pt/trunk/s Update test expectations based on bugfixes in Chameleon RC6.

[Malthe Borch]

Log message for revision 121106:
  Update test expectations based on bugfixes in Chameleon RC6.

Changed:
  U   five.pt/trunk/setup.py
  U   five.pt/trunk/src/five/pt/tests/test_basetemplatefile.py
  U   five.pt/trunk/src/five/pt/tests/test_viewpagetemplatefile.py

-=-
Modified: five.pt/trunk/setup.py
===================================================================
--- five.pt/trunk/setup.py	2011-03-24 11:25:07 UTC (rev 121105)
+++ five.pt/trunk/setup.py	2011-03-24 11:29:13 UTC (rev 121106)
@@ -26,7 +26,7 @@
       install_requires=[
           'setuptools',
           'z3c.pt>=2.0-rc1',
-          'Chameleon>=2.0-rc1',
+          'Chameleon>=2.0-rc6',
           'sourcecodegen',
       ],
       entry_points="""

Modified: five.pt/trunk/src/five/pt/tests/test_basetemplatefile.py
===================================================================
--- five.pt/trunk/src/five/pt/tests/test_basetemplatefile.py	2011-03-24 11:25:07 UTC (rev 121105)
+++ five.pt/trunk/src/five/pt/tests/test_basetemplatefile.py	2011-03-24 11:29:13 UTC (rev 121106)
@@ -17,7 +17,7 @@
         result = template()
         self.failUnless('here==context:True' in result)
         self.failUnless('container==None:True' in result)
-        self.failUnless("nothing:None" in result)
+        self.failUnless("nothing:" in result)
 
     def test_simple(self):
         template = BaseTemplateFile("simple.pt")
@@ -38,7 +38,4 @@
         from AccessControl.SecurityInfo import allow_module
         allow_module("cgi")
         result = template(soup=soup)
-        self.failUnless(
-            '<foo></bar>\n' in result
-        )
-
+        self.failUnless('<foo></bar>' in result)

Modified: five.pt/trunk/src/five/pt/tests/test_viewpagetemplatefile.py
===================================================================
--- five.pt/trunk/src/five/pt/tests/test_viewpagetemplatefile.py	2011-03-24 11:25:07 UTC (rev 121105)
+++ five.pt/trunk/src/five/pt/tests/test_viewpagetemplatefile.py	2011-03-24 11:29:13 UTC (rev 121106)
@@ -57,9 +57,7 @@
         except Unauthorized:
             self.fail("Unexpected exception.")
         else:
-            self.failUnless(
-                '<foo></bar>\n' in result
-                )
+            self.failUnless('<foo></bar>' in result)
 
     def test_locals(self):
         view = LocalsView(self.folder, self.folder.REQUEST)
@@ -70,7 +68,7 @@
         self.failUnless('here==context:True' in result)
         self.failUnless('here==container:True' in result)
         self.failUnless("root:(\'\',)" in result)
-        self.failUnless("nothing:None" in result)
+        self.failUnless("nothing:" in result)
         self.failUnless("rfc822" in result)
 
     def test_options(self):