Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2935 from brendandahl/png-refs2

Browse Source 
Store references as pngs and write failures to separate png files.
This commit is contained in:
Brendan Dahl 2013-03-12 17:18:08 -07:00
commit b51b051b82
1 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
test/test.py
View File

@ -30,6 +30,7 @@ DEFAULT_MANIFEST_FILE = 'test_manifest.json'
EQLOG_FILE = 'eq.log' EQLOG_FILE = 'eq.log'
BROWSERLOG_FILE = 'browser.log' BROWSERLOG_FILE = 'browser.log'
REFDIR = 'ref' REFDIR = 'ref'
TEST_SNAPSHOTS = 'test_snapshots'
TMPDIR = 'tmp' TMPDIR = 'tmp'
VERBOSE = False VERBOSE = False
BROWSER_TIMEOUT = 60 BROWSER_TIMEOUT = 60
@ -643,9 +644,21 @@ def check(task, results, browser, masterMode):
else: else:
assert 0 and 'Unknown test type' assert 0 and 'Unknown test type'
def createDir(dir):
try:
os.makedirs(dir)
except OSError, e:
if e.errno != 17: # file exists
print >>sys.stderr, 'Creating', dir, 'failed!'
def readDataUri(data):
metadata, encoded = data.rsplit(",", 1)
return base64.b64decode(encoded)
def checkEq(task, results, browser, masterMode): def checkEq(task, results, browser, masterMode):
pfx = os.path.join(REFDIR, sys.platform, browser, task['id']) pfx = os.path.join(REFDIR, sys.platform, browser, task['id'])
testSnapshotDir = os.path.join(TEST_SNAPSHOTS, sys.platform, browser, task['id'])
results = results[0] results = results[0]
taskId = task['id'] taskId = task['id']
taskType = task['type'] taskType = task['type']
@ -653,17 +666,17 @@ def checkEq(task, results, browser, masterMode):
passed = True passed = True
for result in results: for result in results:
page = result.page page = result.page
snapshot = result.snapshot snapshot = readDataUri(result.snapshot)
ref = None ref = None
eq = True eq = True
path = os.path.join(pfx, str(page)) path = os.path.join(pfx, str(page) + '.png')
if not os.access(path, os.R_OK): if not os.access(path, os.R_OK):
State.numEqNoSnapshot += 1 State.numEqNoSnapshot += 1
if not masterMode: if not masterMode:
print 'WARNING: no reference snapshot', path print 'WARNING: no reference snapshot', path
else: else:
f = open(path) f = open(path, 'rb')
ref = f.read() ref = f.read()
f.close() f.close()
@ -675,27 +688,29 @@ def checkEq(task, results, browser, masterMode):
State.eqLog = open(EQLOG_FILE, 'w') State.eqLog = open(EQLOG_FILE, 'w')
eqLog = State.eqLog eqLog = State.eqLog
createDir(testSnapshotDir)
testSnapshotPath = os.path.join(testSnapshotDir, str(page) + '.png')
handle = open(testSnapshotPath, 'wb')
handle.write(snapshot)
handle.close()
# NB: this follows the format of Mozilla reftest # NB: this follows the format of Mozilla reftest
# output so that we can reuse its reftest-analyzer # output so that we can reuse its reftest-analyzer
# script # script
eqLog.write('REFTEST TEST-UNEXPECTED-FAIL | ' + browser +'-'+ taskId +'-page'+ str(page) + ' | image comparison (==)\n') eqLog.write('REFTEST TEST-UNEXPECTED-FAIL | ' + browser +'-'+ taskId +'-page'+ str(page) + ' | image comparison (==)\n')
eqLog.write('REFTEST IMAGE 1 (TEST): ' + snapshot + '\n') eqLog.write('REFTEST IMAGE 1 (TEST): ' + '/test/' + testSnapshotPath + '\n')
eqLog.write('REFTEST IMAGE 2 (REFERENCE): ' + ref + '\n') eqLog.write('REFTEST IMAGE 2 (REFERENCE): ' + '/test/' + path + '\n')
passed = False passed = False
State.numEqFailures += 1 State.numEqFailures += 1
if masterMode and (ref is None or not eq): if masterMode and (ref is None or not eq):
tmpTaskDir = os.path.join(TMPDIR, sys.platform, browser, task['id']) tmpTaskDir = os.path.join(TMPDIR, sys.platform, browser, task['id'])
try: createDir(tmpTaskDir)
os.makedirs(tmpTaskDir)
except OSError, e:
if e.errno != 17: # file exists
print >>sys.stderr, 'Creating', tmpTaskDir, 'failed!'
of = open(os.path.join(tmpTaskDir, str(page)), 'w') handle = open(os.path.join(tmpTaskDir, str(page)) + '.png', 'wb')
of.write(snapshot) handle.write(snapshot)
of.close() handle.close()
if passed: if passed:
print 'TEST-PASS |', taskType, 'test', task['id'], '| in', browser print 'TEST-PASS |', taskType, 'test', task['id'], '| in', browser