зеркало из https://github.com/mozilla/treeherder.git
Bug 1165356 - Log parser: Remove tests workaround for file:// log URLs
Now that we're using requests, the log URL being used to access the file is consistent across environments (since it doesn't reference the local directory structure), so we don't need to exclude it from comparisons.
This commit is contained in:
Ed Morley
Родитель
6717d9f5fc
Коммит
aff2152a81
|
|
@ -52,18 +52,12 @@ def test_all_builders_complete():
|
|||
"steps": [],
|
||||
"errors_truncated": False
|
||||
},
|
||||
"logurl": url,
|
||||
},
|
||||
"Job Info": {
|
||||
"job_details": []
|
||||
"job_details": [],
|
||||
"logurl": url,
|
||||
}
|
||||
}
|
||||
act = lpc.artifacts
|
||||
|
||||
# we can't compare the "logurl" field, because it's a fully qualified url,
|
||||
# so it will be different depending on the config it's run in.
|
||||
assert "logurl" in act["text_log_summary"]
|
||||
assert "logurl" in act["Job Info"]
|
||||
del(act["Job Info"]["logurl"])
|
||||
del(act["text_log_summary"]["logurl"])
|
||||
|
||||
assert exp == lpc.artifacts, diff(exp, lpc.artifacts)
|
||||
|
|
|
|||
|
|
@ -29,13 +29,6 @@ def do_test(log):
|
|||
# with open(SampleData().get_log_path("{0}.jobartifact.json".format(log)), "w") as f:
|
||||
# f.write(json.dumps(act, indent=4))
|
||||
|
||||
# we can't compare the "logurl" field, because it's a fully qualified url,
|
||||
# so it will be different depending on the config it's run in.
|
||||
assert "logurl" in act
|
||||
del(act["logurl"])
|
||||
# leaving the logurl in the exp files so they are a good example of the
|
||||
# expected structure.
|
||||
del(exp["logurl"])
|
||||
# assert act == exp, diff(exp, act)
|
||||
|
||||
# if you want to gather results for a new test, use this
|
||||
|
|
|
|||
|
|
@ -32,16 +32,6 @@ def do_test(log):
|
|||
# with open(SampleData().get_log_path("{0}.logview.json".format(log)), "w") as f:
|
||||
# f.write(json.dumps(act, indent=4))
|
||||
|
||||
# we can't compare the "logurl" field, because it's a fully qualified url,
|
||||
# so it will be different depending on the machine it's run on.
|
||||
assert "logurl" in act
|
||||
del(act["logurl"])
|
||||
|
||||
# log urls won't match in tests, since they're machine specific
|
||||
# but leave it in the exp file as an example of what the real structure
|
||||
# should look like.
|
||||
del(exp["logurl"])
|
||||
|
||||
assert act == exp # , diff(exp, act)
|
||||
|
||||
# :: Use this assert when creating new tests and you want to get the actual
|
||||
|
|
|
|||
|
|
@ -66,5 +66,5 @@
|
|||
],
|
||||
"errors_truncated": false
|
||||
},
|
||||
"logurl": "file:///home/vagrant/treeherder/tests/sample_data/logs/crash-1.txt.gz"
|
||||
"logurl": "http://my-log.mozilla.org/crash-1.txt.gz"
|
||||
}
|
||||
|
|
@ -78,5 +78,5 @@
|
|||
],
|
||||
"errors_truncated": false
|
||||
},
|
||||
"logurl": "file:///home/vagrant/treeherder/tests/sample_data/logs/crash-2.txt.gz"
|
||||
"logurl": "http://my-log.mozilla.org/crash-2.txt.gz"
|
||||
}
|
||||
|
|
@ -70,5 +70,5 @@
|
|||
],
|
||||
"errors_truncated": false
|
||||
},
|
||||
"logurl": "file:///home/vagrant/treeherder/tests/sample_data/logs/crash-mac-1.txt.gz"
|
||||
"logurl": "http://my-log.mozilla.org/crash-mac-1.txt.gz"
|
||||
}
|
||||
|
|
@ -54,5 +54,5 @@
|
|||
],
|
||||
"errors_truncated": false
|
||||
},
|
||||
"logurl": "file:///home/vagrant/treeherder/tests/sample_data/logs/crashtest-timeout.txt.gz"
|
||||
"logurl": "http://my-log.mozilla.org/crashtest-timeout.txt.gz"
|
||||
}
|
||||
|
|
@ -254,5 +254,5 @@
|
|||
],
|
||||
"errors_truncated": false
|
||||
},
|
||||
"logurl": "file:///home/vagrant/treeherder/tests/sample_data/logs/jsreftest-fail.txt.gz"
|
||||
"logurl": "http://my-log.mozilla.org/jsreftest-fail.txt.gz"
|
||||
}
|
||||
|
|
@ -62,5 +62,5 @@
|
|||
],
|
||||
"errors_truncated": false
|
||||
},
|
||||
"logurl": "file:///home/vagrant/treeherder/tests/sample_data/logs/jsreftest-timeout-crash.txt.gz"
|
||||
"logurl": "http://my-log.mozilla.org/jsreftest-timeout-crash.txt.gz"
|
||||
}
|
||||
|
|
@ -540,5 +540,5 @@
|
|||
],
|
||||
"errors_truncated": true
|
||||
},
|
||||
"logurl": "file:///home/vagrant/treeherder/tests/sample_data/logs/large-number-of-error-lines.txt.gz"
|
||||
"logurl": "http://my-log.mozilla.org/large-number-of-error-lines.txt.gz"
|
||||
}
|
||||
|
|
@ -74,5 +74,5 @@
|
|||
],
|
||||
"errors_truncated": false
|
||||
},
|
||||
"logurl": "file:///home/vagrant/treeherder/tests/sample_data/logs/leaks-1.txt.gz"
|
||||
"logurl": "http://my-log.mozilla.org/leaks-1.txt.gz"
|
||||
}
|
||||
|
|
@ -58,5 +58,5 @@
|
|||
],
|
||||
"errors_truncated": false
|
||||
},
|
||||
"logurl": "file:///home/vagrant/treeherder/tests/sample_data/logs/mochitest-test-end.txt.gz"
|
||||
"logurl": "http://my-log.mozilla.org/mochitest-test-end.txt.gz"
|
||||
}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{
|
||||
"job_details": [],
|
||||
"logurl": "file:///home/vagrant/treeherder/tests/sample_data/logs/mozilla-central-macosx64-debug-bm65-build1-build15.txt.gz"
|
||||
"logurl": "http://my-log.mozilla.org/mozilla-central-macosx64-debug-bm65-build1-build15.txt.gz"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -499,5 +499,5 @@
|
|||
],
|
||||
"errors_truncated": false
|
||||
},
|
||||
"logurl": "file:///home/vagrant/treeherder/tests/sample_data/logs/mozilla-central-win32-pgo-bm85-build1-build111.txt.gz"
|
||||
"logurl": "http://my-log.mozilla.org/mozilla-central-win32-pgo-bm85-build1-build111.txt.gz"
|
||||
}
|
||||
|
|
@ -12,5 +12,5 @@
|
|||
"title": "crashtest"
|
||||
}
|
||||
],
|
||||
"logurl": "file:///home/vagrant/treeherder/tests/sample_data/logs/mozilla-central_fedora-b2g_test-crashtest-1-bm54-tests1-linux-build50.txt.gz"
|
||||
"logurl": "http://my-log.mozilla.org/mozilla-central_fedora-b2g_test-crashtest-1-bm54-tests1-linux-build50.txt.gz"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -112,5 +112,5 @@
|
|||
],
|
||||
"errors_truncated": false
|
||||
},
|
||||
"logurl": "file:///home/vagrant/treeherder/tests/sample_data/logs/mozilla-central_fedora-b2g_test-crashtest-1-bm54-tests1-linux-build50.txt.gz"
|
||||
"logurl": "http://my-log.mozilla.org/mozilla-central_fedora-b2g_test-crashtest-1-bm54-tests1-linux-build50.txt.gz"
|
||||
}
|
||||
|
|
@ -12,5 +12,5 @@
|
|||
"title": "mochitest-plain2"
|
||||
}
|
||||
],
|
||||
"logurl": "file:///home/vagrant/treeherder/tests/sample_data/logs/mozilla-central_mountainlion-debug_test-mochitest-2-bm80-tests1-macosx-build93.txt.gz"
|
||||
"logurl": "http://my-log.mozilla.org/mozilla-central_mountainlion-debug_test-mochitest-2-bm80-tests1-macosx-build93.txt.gz"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,5 +12,5 @@
|
|||
"title": "mochitest-plain2"
|
||||
}
|
||||
],
|
||||
"logurl": "file:///home/vagrant/treeherder/tests/sample_data/logs/mozilla-central_mountainlion_test-mochitest-2-bm77-tests1-macosx-build141.txt.gz"
|
||||
"logurl": "http://my-log.mozilla.org/mozilla-central_mountainlion_test-mochitest-2-bm77-tests1-macosx-build141.txt.gz"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -112,5 +112,5 @@
|
|||
],
|
||||
"errors_truncated": false
|
||||
},
|
||||
"logurl": "file:///home/vagrant/treeherder/tests/sample_data/logs/mozilla-central_mountainlion_test-mochitest-2-bm77-tests1-macosx-build141.txt.gz"
|
||||
"logurl": "http://my-log.mozilla.org/mozilla-central_mountainlion_test-mochitest-2-bm77-tests1-macosx-build141.txt.gz"
|
||||
}
|
||||
|
|
@ -12,5 +12,5 @@
|
|||
"title": "mochitest-plain2"
|
||||
}
|
||||
],
|
||||
"logurl": "file:///home/vagrant/treeherder/tests/sample_data/logs/mozilla-central_mountainlion_test-mochitest-2-bm80-tests1-macosx-build138.txt.gz"
|
||||
"logurl": "http://my-log.mozilla.org/mozilla-central_mountainlion_test-mochitest-2-bm80-tests1-macosx-build138.txt.gz"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -139,5 +139,5 @@
|
|||
],
|
||||
"errors_truncated": false
|
||||
},
|
||||
"logurl": "file:///home/vagrant/treeherder/tests/sample_data/logs/mozilla-central_ubuntu64_hw_test-androidx86-set-4-bm103-tests1-linux-build369.txt.gz"
|
||||
"logurl": "http://my-log.mozilla.org/mozilla-central_ubuntu64_hw_test-androidx86-set-4-bm103-tests1-linux-build369.txt.gz"
|
||||
}
|
||||
|
|
@ -12,5 +12,5 @@
|
|||
"title": "mochitest-browser-chrome"
|
||||
}
|
||||
],
|
||||
"logurl": "file:///home/vagrant/treeherder/tests/sample_data/logs/mozilla-esr17_xp_test_pgo-mochitest-browser-chrome-bm74-tests1-windows-build12.txt.gz"
|
||||
"logurl": "http://my-log.mozilla.org/mozilla-esr17_xp_test_pgo-mochitest-browser-chrome-bm74-tests1-windows-build12.txt.gz"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -220,5 +220,5 @@
|
|||
],
|
||||
"errors_truncated": false
|
||||
},
|
||||
"logurl": "file:///home/vagrant/treeherder/tests/sample_data/logs/mozilla-esr17_xp_test_pgo-mochitest-browser-chrome-bm74-tests1-windows-build12.txt.gz"
|
||||
"logurl": "http://my-log.mozilla.org/mozilla-esr17_xp_test_pgo-mochitest-browser-chrome-bm74-tests1-windows-build12.txt.gz"
|
||||
}
|
||||
|
|
@ -22,5 +22,5 @@
|
|||
"title": "mochitest-plugins"
|
||||
}
|
||||
],
|
||||
"logurl": "file:///home/vagrant/treeherder/tests/sample_data/logs/mozilla-inbound_ubuntu64_vm-debug_test-mochitest-other-bm53-tests1-linux-build122.txt.gz"
|
||||
"logurl": "http://my-log.mozilla.org/mozilla-inbound_ubuntu64_vm-debug_test-mochitest-other-bm53-tests1-linux-build122.txt.gz"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -161,5 +161,5 @@
|
|||
],
|
||||
"errors_truncated": false
|
||||
},
|
||||
"logurl": "file:///home/vagrant/treeherder/tests/sample_data/logs/mozilla-inbound_ubuntu64_vm-debug_test-mochitest-other-bm53-tests1-linux-build122.txt.gz"
|
||||
"logurl": "http://my-log.mozilla.org/mozilla-inbound_ubuntu64_vm-debug_test-mochitest-other-bm53-tests1-linux-build122.txt.gz"
|
||||
}
|
||||
|
|
@ -94,5 +94,5 @@
|
|||
],
|
||||
"errors_truncated": false
|
||||
},
|
||||
"logurl": "file:///home/vagrant/treeherder/tests/sample_data/logs/multiple-timeouts.txt.gz"
|
||||
"logurl": "http://my-log.mozilla.org/multiple-timeouts.txt.gz"
|
||||
}
|
||||
|
|
@ -58,5 +58,5 @@
|
|||
],
|
||||
"errors_truncated": false
|
||||
},
|
||||
"logurl": "file:///home/vagrant/treeherder/tests/sample_data/logs/opt-objc-exception.txt.gz"
|
||||
"logurl": "http://my-log.mozilla.org/opt-objc-exception.txt.gz"
|
||||
}
|
||||
|
|
@ -70,5 +70,5 @@
|
|||
],
|
||||
"errors_truncated": false
|
||||
},
|
||||
"logurl": "file:///home/vagrant/treeherder/tests/sample_data/logs/reftest-fail-crash.txt.gz"
|
||||
"logurl": "http://my-log.mozilla.org/reftest-fail-crash.txt.gz"
|
||||
}
|
||||
|
|
@ -54,5 +54,5 @@
|
|||
],
|
||||
"errors_truncated": false
|
||||
},
|
||||
"logurl": "file:///home/vagrant/treeherder/tests/sample_data/logs/reftest-jserror.txt.gz"
|
||||
"logurl": "http://my-log.mozilla.org/reftest-jserror.txt.gz"
|
||||
}
|
||||
|
|
@ -54,5 +54,5 @@
|
|||
],
|
||||
"errors_truncated": false
|
||||
},
|
||||
"logurl": "file:///home/vagrant/treeherder/tests/sample_data/logs/reftest-opt-fail.txt.gz"
|
||||
"logurl": "http://my-log.mozilla.org/reftest-opt-fail.txt.gz"
|
||||
}
|
||||
|
|
@ -62,5 +62,5 @@
|
|||
],
|
||||
"errors_truncated": false
|
||||
},
|
||||
"logurl": "file:///home/vagrant/treeherder/tests/sample_data/logs/reftest-timeout.txt.gz"
|
||||
"logurl": "http://my-log.mozilla.org/reftest-timeout.txt.gz"
|
||||
}
|
||||
|
|
@ -45,5 +45,5 @@
|
|||
],
|
||||
"errors_truncated": false
|
||||
},
|
||||
"logurl": "file:///home/vagrant/treeherder/tests/sample_data/logs/taskcluster-missing-finish-step-marker.txt.gz"
|
||||
"logurl": "http://my-log.mozilla.org/taskcluster-missing-finish-step-marker.txt.gz"
|
||||
}
|
||||
|
|
@ -62,5 +62,5 @@
|
|||
],
|
||||
"errors_truncated": false
|
||||
},
|
||||
"logurl": "file:///home/vagrant/treeherder/tests/sample_data/logs/tinderbox-exception.txt.gz"
|
||||
"logurl": "http://my-log.mozilla.org/tinderbox-exception.txt.gz"
|
||||
}
|
||||
|
|
@ -12,5 +12,5 @@
|
|||
"title": "jetpack"
|
||||
}
|
||||
],
|
||||
"logurl": "file:///home/vagrant/treeherder/tests/sample_data/logs/ux_ubuntu32_vm_test-jetpack-bm67-tests1-linux-build16.txt.gz"
|
||||
"logurl": "http://my-log.mozilla.org/ux_ubuntu32_vm_test-jetpack-bm67-tests1-linux-build16.txt.gz"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -227,5 +227,5 @@
|
|||
],
|
||||
"errors_truncated": false
|
||||
},
|
||||
"logurl": "file:///home/vagrant/treeherder/tests/sample_data/logs/ux_ubuntu32_vm_test-jetpack-bm67-tests1-linux-build16.txt.gz"
|
||||
"logurl": "http://my-log.mozilla.org/ux_ubuntu32_vm_test-jetpack-bm67-tests1-linux-build16.txt.gz"
|
||||
}
|
||||
|
|
@ -58,5 +58,5 @@
|
|||
],
|
||||
"errors_truncated": false
|
||||
},
|
||||
"logurl": "file:///home/vagrant/treeherder/tests/sample_data/logs/xpcshell-crash.txt.gz"
|
||||
"logurl": "http://my-log.mozilla.org/xpcshell-crash.txt.gz"
|
||||
}
|
||||
|
|
@ -58,5 +58,5 @@
|
|||
],
|
||||
"errors_truncated": false
|
||||
},
|
||||
"logurl": "file:///home/vagrant/treeherder/tests/sample_data/logs/xpcshell-multiple.txt.gz"
|
||||
"logurl": "http://my-log.mozilla.org/xpcshell-multiple.txt.gz"
|
||||
}
|
||||
|
|
@ -58,5 +58,5 @@
|
|||
],
|
||||
"errors_truncated": false
|
||||
},
|
||||
"logurl": "file:///home/vagrant/treeherder/tests/sample_data/logs/xpcshell-timeout.txt.gz"
|
||||
"logurl": "http://my-log.mozilla.org/xpcshell-timeout.txt.gz"
|
||||
}
|
||||
Загрузка…
Ссылка в новой задаче