commit d04a36b4ab1fa1e476b631dd3275d1861fdbf5be
author Jonas Termansen <sortie@google.com> Thu Oct 18 12:38:39 2018 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org> Thu Oct 18 12:38:39 2018 +0000
tree a81090895f8c2a2ab8718e2a50c952545b94c7b0
parent 1061c8377993a5a5e4ab2cb8a1426bd8c8e03c24

[infra] Fix third_party/pkg_tested step having slash in name.

The step names of test.py invocations are currently used as directory names
in cloud storage. This unintentionally creates an unexpected subdirectory
where the top third_party/ directory is malformed because it doesn't have
the right contents.

Change-Id: I57e32ed917ba863e9bccf611f496e520b9a97310
Reviewed-on: https://dart-review.googlesource.com/c/80620
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Jonas Termansen <sortie@google.com>

tools/bots/test_matrix.json

diff --git a/tools/bots/test_matrix.json b/tools/bots/test_matrix.json
index 30c968f..da897e5 100644
--- a/tools/bots/test_matrix.json
+++ b/tools/bots/test_matrix.json
@@ -1619,7 +1619,7 @@
           "tests": ["pkg"]
         },
         {
-          "name": "third_party/pkg_tested unit tests",
+          "name": "third_party pkg_tested unit tests",
           "arguments": [
             "-nunittest-asserts-${system}"],
           "tests": ["pkg_tested"]

tools/gardening/lib/src/buildbot_data.dart

diff --git a/tools/gardening/lib/src/buildbot_data.dart b/tools/gardening/lib/src/buildbot_data.dart
index 307ba4d..ebca746 100644
--- a/tools/gardening/lib/src/buildbot_data.dart
+++ b/tools/gardening/lib/src/buildbot_data.dart
@@ -746,19 +746,19 @@
         'pkg-mac10.11-release-be',
       ], testSteps: const <String>[
         'package unit tests',
-        'third_party/pkg_tested unit tests',
+        'third_party pkg_tested unit tests',
       ]),
       const BuildSubgroup(shardNames: const <String>[
         'pkg-linux-release-be',
       ], testSteps: const <String>[
         'package unit tests',
-        'third_party/pkg_tested unit tests',
+        'third_party pkg_tested unit tests',
       ]),
       const BuildSubgroup(shardNames: const <String>[
         'pkg-win7-release-be',
       ], testSteps: const <String>[
         'package unit tests',
-        'third_party/pkg_tested unit tests',
+        'third_party pkg_tested unit tests',
       ]),
     ],
   ),

tools/gardening/test/buildbot_data_test.dart

diff --git a/tools/gardening/test/buildbot_data_test.dart b/tools/gardening/test/buildbot_data_test.dart
index 5a76a7e..3f6788a 100644
--- a/tools/gardening/test/buildbot_data_test.dart
+++ b/tools/gardening/test/buildbot_data_test.dart
@@ -44,11 +44,11 @@
   // TODO(johnniwinther): Find out why these steps cannot be read.
   Expect.setEquals([
     '/builders/pkg-mac10.11-release-be/builds/-1/'
-        'steps/third_party/pkg_tested unit tests',
+        'steps/third_party pkg_tested unit tests',
     '/builders/pkg-linux-release-be/builds/-1/steps/'
-        'third_party/pkg_tested unit tests',
+        'third_party pkg_tested unit tests',
     '/builders/pkg-win7-release-be/builds/-1/steps/'
-        'third_party/pkg_tested unit tests',
+        'third_party pkg_tested unit tests',
   ], failingUris,
       "Unexpected failing buildbot uris:\n ${failingUris.join('\n ')}");