comparison test/test_cgi.py @ 5513:19bd4b413ed6

be more lenient when comparing string results
author Christof Meerwald <cmeerw@cmeerw.org>
date Sat, 18 Aug 2018 23:04:22 +0100
parents 52cb53eedf77
children cd0ceb2afdb8
comparison
equal deleted inserted replaced
5512:c652849bfc75 5513:19bd4b413ed6
25 25
26 from .mocknull import MockNull 26 from .mocknull import MockNull
27 27
28 from . import db_test_base 28 from . import db_test_base
29 from .db_test_base import FormTestParent, setupTracker, FileUpload 29 from .db_test_base import FormTestParent, setupTracker, FileUpload
30 from .cmp_helper import StringFragmentCmpHelper
30 31
31 class FileList: 32 class FileList:
32 def __init__(self, name, *files): 33 def __init__(self, name, *files):
33 self.name = name 34 self.name = name
34 self.files = files 35 self.files = files
69 def testAddMessageNoEscape(self): 70 def testAddMessageNoEscape(self):
70 self.assertEqual(cm([],'<i>x</i>',False), ['<i>x</i>']) 71 self.assertEqual(cm([],'<i>x</i>',False), ['<i>x</i>'])
71 self.assertEqual(cm([],'<i>x</i>\n<b>x</b>',False), 72 self.assertEqual(cm([],'<i>x</i>\n<b>x</b>',False),
72 ['<i>x</i><br />\n<b>x</b>']) 73 ['<i>x</i><br />\n<b>x</b>'])
73 74
74 class FormTestCase(FormTestParent, unittest.TestCase): 75 class FormTestCase(FormTestParent, StringFragmentCmpHelper, unittest.TestCase):
75 76
76 def setUp(self): 77 def setUp(self):
77 FormTestParent.setUp(self) 78 FormTestParent.setUp(self)
78 79
79 vars = {} 80 vars = {}
1064 del(out[0]) 1065 del(out[0])
1065 1066
1066 # remove the X-REQUESTED-WITH header and get an xmlrpc fault returned 1067 # remove the X-REQUESTED-WITH header and get an xmlrpc fault returned
1067 del(cl.env['HTTP_X-REQUESTED-WITH']) 1068 del(cl.env['HTTP_X-REQUESTED-WITH'])
1068 cl.handle_xmlrpc() 1069 cl.handle_xmlrpc()
1069 output="<?xml version='1.0'?>\n<methodResponse>\n<fault>\n<value><struct>\n<member>\n<name>faultCode</name>\n<value><int>1</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>&lt;class 'roundup.exceptions.UsageError'&gt;:Required Header Missing</string></value>\n</member>\n</struct></value>\n</fault>\n</methodResponse>\n" 1070 frag_faultCode = "<member>\n<name>faultCode</name>\n<value><int>1</int></value>\n</member>\n"
1071 frag_faultString = "<member>\n<name>faultString</name>\n<value><string>&lt;class 'roundup.exceptions.UsageError'&gt;:Required Header Missing</string></value>\n</member>\n"
1072 output_fragments = ["<?xml version='1.0'?>\n",
1073 "<methodResponse>\n",
1074 "<fault>\n",
1075 "<value><struct>\n",
1076 (frag_faultCode + frag_faultString,
1077 frag_faultString + frag_faultCode),
1078 "</struct></value>\n",
1079 "</fault>\n",
1080 "</methodResponse>\n"]
1070 print(out[0]) 1081 print(out[0])
1071 self.assertEqual(output,out[0]) 1082 self.compareStringFragments(out[0], output_fragments)
1072 del(out[0]) 1083 del(out[0])
1073 1084
1074 # change config to not require X-REQUESTED-WITH header 1085 # change config to not require X-REQUESTED-WITH header
1075 cl.db.config['WEB_CSRF_ENFORCE_HEADER_X-REQUESTED-WITH'] = 'logfailure' 1086 cl.db.config['WEB_CSRF_ENFORCE_HEADER_X-REQUESTED-WITH'] = 'logfailure'
1076 cl.handle_xmlrpc() 1087 cl.handle_xmlrpc()

Roundup Issue Tracker: http://roundup-tracker.org/