changeset 5024:6f425b775fb5

Automated merge with http://hg.moinmo.in/moin/1.9
author Dmitrijs Milajevs <dimazest@gmail.com>
date Thu, 20 Aug 2009 16:47:52 +0200
parents b16cea282fe0 (diff) 11ce9cde8f85 (current diff)
children aca1825d1890
files MoinMoin/search/queryparser.py MoinMoin/support/xapwrap/__init__.py MoinMoin/support/xapwrap/document.py MoinMoin/support/xapwrap/index.py
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/macro/_tests/test_GetVal.py	Wed Aug 19 23:54:33 2009 +0200
+++ b/MoinMoin/macro/_tests/test_GetVal.py	Thu Aug 20 16:47:52 2009 +0200
@@ -47,9 +47,9 @@
     def testGetValACLs(self):
         """ macro GetVal test: 'cant read VAR on an ACL protected page' """
         py.test.skip("user has no rights to create acl pages")
-        self.page = create_page(self.request, self.pagename,
-                                '#acl SomeUser:read,write All:delete\n VAR:: This is an example')
-        result = self._test_macro(u'GetVal', "%s,%s" % (self.pagename, u'VAR'))
+        page = create_page(self.request, self.pagename,
+                           '#acl SomeUser:read,write All:delete\n VAR:: This is an example')
+        result = self._test_macro(u'GetVal', "%s,%s" % (self.pagename, u'VAR'), page)
         assert result == "&lt;&lt;GetVal: You don't have enough rights on this page&gt;&gt;"
 
 coverage_modules = ['MoinMoin.macro.GetVal']
--- a/MoinMoin/script/migration/_tests/test_conv160_wiki.py	Wed Aug 19 23:54:33 2009 +0200
+++ b/MoinMoin/script/migration/_tests/test_conv160_wiki.py	Thu Aug 20 16:47:52 2009 +0200
@@ -115,7 +115,7 @@
             # macros
             ('[[BR]]', {}, '<<BR>>'),
             ('[[FullSearch(wtf)]]', {}, '<<FullSearch(wtf)>>'),
-            (u'[[ImageLink(t�st.png)]]', {}, u'[[attachment:t�st.png|{{attachment:t�st.png}}]]'),
+            (u'[[ImageLink(töst.png)]]', {}, u'[[attachment:töst.png|{{attachment:töst.png}}]]'),
             ('[[ImageLink(test.png,OtherPage)]]', {}, '[[OtherPage|{{attachment:test.png}}]]'),
             ('[[ImageLink(test.png,OtherPage,width=123,height=456)]]', {}, '[[OtherPage|{{attachment:test.png||width=123, height=456}}]]'),
             ('[[ImageLink(test.png,OtherPage,width=123,height=456,alt=alttext)]]', {}, '[[OtherPage|{{attachment:test.png|alttext|width=123, height=456}}]]'),