Fix unit tests & keep string conversions

Author: Bastien Abadie

bot/code_coverage_bot/artifacts.py

@@ -60,8 +60,8 @@ def get(self, platform=None, suite=None, chunk=None):
         return filtered_files
 
     def download(self, test_task):
-        chunk_name = taskcluster.get_chunk(test_task["task"]["metadata"]["name"])
-        platform_name = taskcluster.get_platform(test_task["task"]["metadata"]["name"])
+        chunk_name = taskcluster.get_chunk(test_task["task"])
+        platform_name = taskcluster.get_platform(test_task["task"])
         test_task_id = test_task["status"]["taskId"]
 
         for artifact in taskcluster.get_task_artifacts(test_task_id):
@@ -104,7 +104,8 @@ def download_all(self):
             task
             for group in groups
             for task in taskcluster.get_tasks_in_group(group)
-            if taskcluster.is_coverage_task(task) and not self.is_filtered_task(task)
+            if taskcluster.is_coverage_task(task["task"])
+            and not self.is_filtered_task(task)
         ]
         logger.info("Downloading artifacts from {} tasks".format(len(test_tasks)))
 
@@ -130,10 +131,8 @@ def download_all(self):
                 status
             )
 
-            chunk_name = taskcluster.get_chunk(test_task["task"]["metadata"]["name"])
-            platform_name = taskcluster.get_platform(
-                test_task["task"]["metadata"]["name"]
-            )
+            chunk_name = taskcluster.get_chunk(test_task["task"])
+            platform_name = taskcluster.get_platform(test_task["task"])
 
             if any(to_ignore in chunk_name for to_ignore in SUITES_TO_IGNORE):
                 continue

bot/code_coverage_bot/chunk_mapping.py

@@ -62,6 +62,8 @@ def get_tests_chunks(revision, platform, suite):
         run_key_prefix = "test-linux64-ccov"
     elif platform == "windows":
         run_key_prefix = "test-windows10-64-ccov"
+    else:
+        raise Exception("Unsupported platform {}".format(platform))
 
     r = requests.post(
         ACTIVEDATA_QUERY_URL,
@@ -239,7 +241,7 @@ def _inner_generate(
             def chunk_test_iter():
                 test_iter = enumerate(tests_data["result.test"])
                 return (
-                    (platform, taskcluster.get_chunk(task_names[i]), test)
+                    (platform, taskcluster.name_to_chunk(task_names[i]), test)
                     for i, test in test_iter
                 )
 
@@ -257,7 +259,7 @@ def chunk_test_iter():
         (platform, chunk) = futures[future]
         files = future.result()
 
-        suite = taskcluster.get_suite(chunk)
+        suite = taskcluster.chunk_to_suite(chunk)
         if is_chunk_only_suite(suite):
             per_test_cursor.executemany(
                 "INSERT INTO file_to_chunk VALUES (?,?,?)",

bot/code_coverage_bot/taskcluster.py

@@ -109,11 +109,54 @@ def perform_download():
     retry(perform_download)
 
 
+BUILD_PLATFORMS = [
+    "build-linux64-ccov/debug",
+    "build-win64-ccov/debug",
+    "build-android-test-ccov/opt",
+]
+
+TEST_PLATFORMS = [
+    "test-linux64-ccov/debug",
+    "test-windows10-64-ccov/debug",
+    "test-android-em-4.3-arm7-api-16-ccov/debug",
+] + BUILD_PLATFORMS
+
+
 def is_coverage_task(task):
-    return get_suite(task) != "build"
+    return any(task["metadata"]["name"].startswith(t) for t in TEST_PLATFORMS)
+
+
+def name_to_chunk(name):
+    """
+    Helper to convert a task naem to a chunk
+    Used by chunk mapping
+    """
+    assert isinstance(name, str)
+
+    # Some tests are run on build machines, we define a placeholder chunk for those.
+    if name in BUILD_PLATFORMS:
+        return "build"
+
+    for t in TEST_PLATFORMS:
+        if name.startswith(t):
+            name = name[len(t) + 1 :]
+            break
+    return "-".join([p for p in name.split("-") if p != "e10s"])
+
+
+def chunk_to_suite(chunk):
+    """
+    Helper to convert a chunk to a suite (no numbers)
+    Used by chunk mapping
+    """
+    assert isinstance(chunk, str)
+    return "-".join([p for p in chunk.split("-") if not p.isdigit()])
 
 
 def get_chunk(task):
+    """
+    Build clean chunk name from a Taskcluster task
+    """
     suite = get_suite(task)
     chunks = task["extra"].get("chunks", {})
     if "current" in chunks:
@@ -122,6 +165,9 @@ def get_chunk(task):
 
 
 def get_suite(task):
+    """
+    Build clean suite name from a Taskcluster task
+    """
     assert isinstance(task, dict)
     tags = task["tags"]
     extra = task["extra"]
@@ -140,6 +186,10 @@ def get_suite(task):
 
 
 def get_platform(task):
+    """
+    Build clean platform from a Taskcluster task
+    """
+    assert isinstance(task, dict)
     assert isinstance(task, dict)
     tags = task.get("tags", {})
     platform = tags.get("os")

bot/tests/fixtures/build-win64/debug.json

@@ -0,0 +1,112 @@
+{
+  "provisionerId": "aws-provisioner-v1",
+  "workerType": "gecko-3-b-win2012",
+  "schedulerId": "gecko-level-3",
+  "taskGroupId": "Mu6w3n-dS9GOfrv6wGOtvg",
+  "dependencies": [
+    "A2glmsCuQP6RKiZ2b64GWw",
+    "A2x8ujDgTjiUU55Ym0vKFg",
+    "GpEX9Ol1RRKqxoUtKaEe3Q",
+    "HdSEPz7vQTCG528C4aPYLA",
+    "HeAtunPjSe6ovqMjikX_cQ",
+    "LebTjyemRzylVAXC0W52jA",
+    "cz8EDILrTYinz5bdpsJUxQ",
+    "Mu6w3n-dS9GOfrv6wGOtvg"
+  ],
+  "requires": "all-completed",
+  "routes": [
+    "index.gecko.v2.mozilla-central.latest.firefox.win64-debug",
+    "index.gecko.v2.mozilla-central.pushdate.2019.03.28.20190328173141.firefox.win64-debug",
+    "index.gecko.v2.mozilla-central.pushlog-id.35772.firefox.win64-debug",
+    "index.gecko.v2.mozilla-central.revision.e31357c7759379d2279b6883cb09c91997bfaa5d.firefox.win64-debug",
+    "index.gecko.v2.trunk.revision.e31357c7759379d2279b6883cb09c91997bfaa5d.firefox.win64-debug",
+    "tc-treeherder.v2.mozilla-central.e31357c7759379d2279b6883cb09c91997bfaa5d.35772"
+  ],
+  "priority": "medium",
+  "retries": 5,
+  "created": "2019-03-28T17:38:38.226Z",
+  "deadline": "2019-03-29T17:38:38.226Z",
+  "expires": "2020-03-27T17:38:38.226Z",
+  "scopes": [
+    "secrets:get:project/releng/gecko/build/level-3/*",
+    "secrets:get:project/taskcluster/gecko/hgfingerprint"
+  ],
+  "payload": {
+    "maxRunTime": 7200,
+    "artifacts": [
+      {
+        "path": "logs",
+        "type": "directory",
+        "name": "public/logs"
+      },
+      {
+        "path": "public/build",
+        "type": "directory",
+        "name": "public/build"
+      }
+    ],
+    "command": [
+      ":: sccache currently uses the full compiler commandline as input to the\n:: cache hash key, so create a symlink to the task dir and build from\n:: the symlink dir to get consistent paths.\nif exist z:\\build rmdir z:\\build",
+      "mklink /d z:\\build %cd%",
+      "icacls z:\\build /grant *S-1-1-0:D /L",
+      "cd /d z:\\build",
+      "\"c:\\Program Files\\Mercurial\\hg.exe\" robustcheckout --sharebase y:\\hg-shared --purge --upstream https://hg.mozilla.org/mozilla-unified --revision e31357c7759379d2279b6883cb09c91997bfaa5d https://hg.mozilla.org/mozilla-central .\\build\\src",
+      ":: TinderboxPrint:<a href=https://hg.mozilla.org/mozilla-central/rev/e31357c7759379d2279b6883cb09c91997bfaa5d title='Built from mozilla-central revision e31357c7759379d2279b6883cb09c91997bfaa5d'>e31357c7759379d2279b6883cb09c91997bfaa5d</a>\n",
+      "c:\\mozilla-build\\python\\python.exe .\\build\\src\\testing\\mozharness\\scripts\\fx_desktop_build.py --config builds\\releng_base_firefox.py --config builds\\taskcluster_base_windows.py --config builds\\taskcluster_base_win64.py --config builds\\taskcluster_sub_win64\\debug.py --branch mozilla-central --work-dir %cd:Z:=z:%\\build --append-env-variables-from-configs"
+    ],
+    "features": {
+      "taskclusterProxy": true,
+      "chainOfTrust": true
+    },
+    "env": {
+      "MOZ_SOURCE_CHANGESET": "e31357c7759379d2279b6883cb09c91997bfaa5d",
+      "MOZ_BUILD_DATE": "20190328173141",
+      "MOZ_SOURCE_REPO": "https://hg.mozilla.org/mozilla-central",
+      "HG_STORE_PATH": "y:/hg-shared",
+      "GECKO_HEAD_REV": "e31357c7759379d2279b6883cb09c91997bfaa5d",
+      "MH_BRANCH": "mozilla-central",
+      "GECKO_PATH": "./build/src",
+      "MOZ_SCM_LEVEL": "3",
+      "EXTRA_MOZHARNESS_CONFIG": "{\"update_channel\": \"nightly\", \"mozconfig_variant\": \"debug\"}",
+      "MOZ_TOOLCHAINS": "public/build/clang.tar.bz2@HdSEPz7vQTCG528C4aPYLA public/build/rustc.tar.bz2@cz8EDILrTYinz5bdpsJUxQ public/build/rust-size.tar.bz2@HeAtunPjSe6ovqMjikX_cQ public/build/cbindgen.tar.bz2@A2glmsCuQP6RKiZ2b64GWw public/build/sccache2.tar.bz2@GpEX9Ol1RRKqxoUtKaEe3Q public/build/nasm.tar.bz2@A2x8ujDgTjiUU55Ym0vKFg public/build/node.tar.bz2@LebTjyemRzylVAXC0W52jA",
+      "MOZ_SIMPLE_PACKAGE_NAME": "target",
+      "SCCACHE_IDLE_TIMEOUT": "0",
+      "GECKO_HEAD_REPOSITORY": "https://hg.mozilla.org/mozilla-central",
+      "TOOLTOOL_MANIFEST": "browser/config/tooltool-manifests/win64/releng.manifest",
+      "USE_SCCACHE": "1",
+      "MOZ_AUTOMATION": "1",
+      "GECKO_BASE_REPOSITORY": "https://hg.mozilla.org/mozilla-unified"
+    }
+  },
+  "metadata": {
+    "owner": "[email protected]",
+    "source": "https://hg.mozilla.org/mozilla-central/file/e31357c7759379d2279b6883cb09c91997bfaa5d/taskcluster/ci/build",
+    "description": "Win64 Debug ([Treeherder push](https://treeherder.mozilla.org/#/jobs?repo=mozilla-central&revision=e31357c7759379d2279b6883cb09c91997bfaa5d))",
+    "name": "build-win64/debug"
+  },
+  "tags": {
+    "os": "windows",
+    "createdForUser": "[email protected]",
+    "worker-implementation": "generic-worker",
+    "kind": "build",
+    "label": "build-win64/debug"
+  },
+  "extra": {
+    "index": {
+      "rank": 1553794301
+    },
+    "treeherder": {
+      "machine": {
+        "platform": "windows2012-64"
+      },
+      "tier": 1,
+      "symbol": "B",
+      "jobKind": "build",
+      "collection": {
+        "debug": true
+      }
+    },
+    "treeherder-platform": "windows2012-64/debug",
+    "parent": "Mu6w3n-dS9GOfrv6wGOtvg"
+  }
+}