gm/rebaseline_server/results.py - Issue 196533021: rebaseline_server: make intermediate JSON specify base urls for diff images

Side by Side Diff: gm/rebaseline_server/results.py

Issue 196533021: rebaseline_server: make intermediate JSON specify base urls for diff images (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Created 6 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

OLD	NEW
1 #!/usr/bin/python	1 #!/usr/bin/python

2	2

3 """	3 """

4 Copyright 2013 Google Inc.	4 Copyright 2013 Google Inc.

5	5

6 Use of this source code is governed by a BSD-style license that can be	6 Use of this source code is governed by a BSD-style license that can be

7 found in the LICENSE file.	7 found in the LICENSE file.

8	8

9 Repackage expected/actual GM results as needed by our HTML rebaseline viewer.	9 Repackage expected/actual GM results as needed by our HTML rebaseline viewer.

10 """	10 """

(...skipping 20 matching lines...) Expand all Loading...
31 TRUNK_DIRECTORY = os.path.dirname(GM_DIRECTORY)	31 TRUNK_DIRECTORY = os.path.dirname(GM_DIRECTORY)

32 if GM_DIRECTORY not in sys.path:	32 if GM_DIRECTORY not in sys.path:

33 sys.path.append(GM_DIRECTORY)	33 sys.path.append(GM_DIRECTORY)

34 import gm_json	34 import gm_json

35 import imagediffdb	35 import imagediffdb

36 import imagepair	36 import imagepair

37 import imagepairset	37 import imagepairset

38	38

39 # Keys used to link an image to a particular GM test.	39 # Keys used to link an image to a particular GM test.

40 # NOTE: Keep these in sync with static/constants.js	40 # NOTE: Keep these in sync with static/constants.js

41 REBASELINE_SERVER_SCHEMA_VERSION_NUMBER = 1	41 REBASELINE_SERVER_SCHEMA_VERSION_NUMBER = 2
	epoger 2014/03/14 16:12:13 Because of the version number bump, I will need to Because of the version number bump, I will need to restart the live production rebaseline server instance after commit.
42 KEY__EXPECTATIONS__BUGS = gm_json.JSONKEY_EXPECTEDRESULTS_BUGS	42 KEY__EXPECTATIONS__BUGS = gm_json.JSONKEY_EXPECTEDRESULTS_BUGS

43 KEY__EXPECTATIONS__IGNOREFAILURE = gm_json.JSONKEY_EXPECTEDRESULTS_IGNOREFAILURE	43 KEY__EXPECTATIONS__IGNOREFAILURE = gm_json.JSONKEY_EXPECTEDRESULTS_IGNOREFAILURE

44 KEY__EXPECTATIONS__REVIEWED = gm_json.JSONKEY_EXPECTEDRESULTS_REVIEWED	44 KEY__EXPECTATIONS__REVIEWED = gm_json.JSONKEY_EXPECTEDRESULTS_REVIEWED

45 KEY__EXTRACOLUMN__BUILDER = 'builder'	45 KEY__EXTRACOLUMN__BUILDER = 'builder'

46 KEY__EXTRACOLUMN__CONFIG = 'config'	46 KEY__EXTRACOLUMN__CONFIG = 'config'

47 KEY__EXTRACOLUMN__RESULT_TYPE = 'resultType'	47 KEY__EXTRACOLUMN__RESULT_TYPE = 'resultType'

48 KEY__EXTRACOLUMN__TEST = 'test'	48 KEY__EXTRACOLUMN__TEST = 'test'

49 KEY__HEADER = 'header'	49 KEY__HEADER = 'header'

50 KEY__HEADER__DATAHASH = 'dataHash'	50 KEY__HEADER__DATAHASH = 'dataHash'

51 KEY__HEADER__IS_EDITABLE = 'isEditable'	51 KEY__HEADER__IS_EDITABLE = 'isEditable'

(...skipping 444 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
496 results = Results(actuals_root=args.actuals,	496 results = Results(actuals_root=args.actuals,

497 expected_root=args.expectations,	497 expected_root=args.expectations,

498 generated_images_root=args.workdir)	498 generated_images_root=args.workdir)

499 gm_json.WriteToFile(	499 gm_json.WriteToFile(

500 results.get_packaged_results_of_type(results_type=args.results),	500 results.get_packaged_results_of_type(results_type=args.results),

501 args.outfile)	501 args.outfile)

502	502

503	503

504 if __name__ == '__main__':	504 if __name__ == '__main__':

505 main()	505 main()

OLD	NEW

« gm/rebaseline_server/imagepairset_test.py ('K') | « gm/rebaseline_server/imagepairset_test.py ('k') | gm/rebaseline_server/server.py » ('j') | gm/rebaseline_server/static/loader.js » ('J')