Commit f1de2428 authored by Andrea Valassi's avatar Andrea Valassi
Browse files

Remove alien error messages about CFPasteboardRef on Mac to prevent

them from polluting stderr and causing qmtest failures (CORALCOOL-2889).


git-svn-id: file:///git/lcgcool.svndb/cool/trunk@19969 4525493e-7705-40b1-a816-d608a930855b
parent ec2f3230
......@@ -637,6 +637,31 @@ class StandardTest(ShellCommandTest):
if "standard output" in causes: causes.remove("standard output")
return causes
def __CompareText(self, s1, s2): # Called by ExecTestBase.ValidateOutput
"""Compare 's1' and 's2', ignoring line endings.
's1' -- A string.
's2' -- A string.
returns -- True if 's1' and 's2' are the same, ignoring
differences in line endings.
This is the standard mode in which QMTest works """
# The "splitlines" method works independently of the line ending
# convention in use.
if platform.system() != 'Darwin':
return s1.splitlines() == s2.splitlines()
else:
# Workaround for CFPasteboardRef issues on Mac (CORALCOOL-2889)
s1s = s1.splitlines()
s2s = s2.splitlines()
for l in list(s1s):
if 'CFPasteboardRef CFPasteboardCreate(CFAllocatorRef, CFStringRef) : failed to create global data' in l: s1s.remove(l)
for l in list(s2s):
if 'CFPasteboardRef CFPasteboardCreate(CFAllocatorRef, CFStringRef) : failed to create global data' in l: s2s.remove(l)
return s1s == s2s
class DatabaseTest(StandardTest):
""" This class adds to the standard QMTest shell command test the
possibility of setting the environment needed to run COOL tests.
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment