Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-02 20:20:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge mozilla-central to autoland. r=merge a=merge

Browse Source
This commit is contained in:
Sebastian Hengst 2017-11-09 00:52:17 +01:00
commit ad5f08ae5a
2 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
mobile/locales/l10n-changesets.json
View File

@ -1,4 +1,11 @@
{
"ach": {
"platforms": [
"android",
"android-api-16"
],
"revision": "default"
},
"an": {
"platforms": [
"android",
@ -79,6 +86,13 @@
],
"revision": "default"
},
"bs": {
"platforms": [
"android",
"android-api-16"
],
"revision": "default"
},
"ca": {
"platforms": [
"android",
@ -343,6 +357,13 @@
],
"revision": "default"
},
"ia": {
"platforms": [
"android",
"android-api-16"
],
"revision": "default"
},
"id": {
"platforms": [
"android",
@ -431,6 +452,13 @@
],
"revision": "default"
},
"ltg": {
"platforms": [
"android",
"android-api-16"
],
"revision": "default"
},
"lv": {
"platforms": [
"android",
@ -511,6 +539,13 @@
],
"revision": "default"
},
"oc": {
"platforms": [
"android",
"android-api-16"
],
"revision": "default"
},
"or": {
"platforms": [
"android",

5
testing/mozharness/scripts/desktop_unittest.py
View File

@ -674,7 +674,10 @@ class DesktopUnittest(TestingMixin, MercurialScript, BlobUploadMixin, MozbaseMix
Create the system-info.log artifact file, containing a variety of
system information that might be useful in diagnosing test failures.
"""
import psutil
try:
import psutil
except:
return
dir = self.query_abs_dirs()['abs_blob_upload_dir']
self.mkdir_p(dir)
path = os.path.join(dir, "system-info.log")