Rename "service_unittests" -> "services_unittests".

Test suites are supposed to have the same name as the directory they're in; also this test target doesn't test a single service, it tests multiple. BUG=722546 Review-Url: https://codereview.chromium.org/2908843002 Cr-Commit-Position: refs/heads/master@{#475192}
FairyWorld · May 26, 2017 · cd559ca · cd559ca
1 parent 3b9ad10
commit cd559ca
Show file tree

Hide file tree

Showing 11 changed files with 44 additions and 44 deletions.
diff --git a/BUILD.gn b/BUILD.gn
@@ -177,7 +177,7 @@ group("gn_all") {
       "//mojo/edk/test:mojo_public_bindings_unittests",
       "//mojo/edk/test:mojo_public_system_unittests",
       "//net:net_perftests",
-      "//services:service_unittests",
+      "//services:services_unittests",
       "//services/service_manager/public/cpp",
       "//storage:storage_unittests",
       "//third_party/WebKit/Source/platform:blink_platform_unittests",

diff --git a/services/BUILD.gn b/services/BUILD.gn
@@ -13,8 +13,8 @@ import("//testing/test.gni")
 # To add tests for a new service, please define a "tests" source_set in the
 # service subdirectory and add it as a dependency here. If your unit tests
 # use the ServiceTest framework, you must also include corresponding catalog
-# entries in the "service_unittests_catalog" target below.
-service_test("service_unittests") {
+# entries in the "services_unittests_catalog" target below.
+service_test("services_unittests") {
   deps = [
     "//services/data_decoder:tests",
     "//services/device:tests",
@@ -63,10 +63,10 @@ service_test("service_unittests") {
 
   test_runner = "//services/test:run_all_service_tests"
 
-  catalog = ":service_unittests_catalog"
+  catalog = ":services_unittests_catalog"
 }
 
-catalog("service_unittests_catalog") {
+catalog("services_unittests_catalog") {
   testonly = true
   catalog_deps = [
     "//services/device:tests_catalog",

diff --git a/testing/buildbot/chromium.android.json b/testing/buildbot/chromium.android.json
@@ -1182,7 +1182,7 @@
             }
           ]
         },
-        "test": "service_unittests"
+        "test": "services_unittests"
       },
       {
         "merge": {

diff --git a/testing/buildbot/chromium.chromiumos.json b/testing/buildbot/chromium.chromiumos.json
@@ -366,7 +366,7 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
-        "test": "service_unittests"
+        "test": "services_unittests"
       },
       {
         "swarming": {
@@ -743,7 +743,7 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
-        "test": "service_unittests"
+        "test": "services_unittests"
       },
       {
         "swarming": {
@@ -1095,7 +1095,7 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
-        "test": "service_unittests"
+        "test": "services_unittests"
       },
       {
         "swarming": {

diff --git a/testing/buildbot/chromium.fyi.json b/testing/buildbot/chromium.fyi.json
@@ -11716,7 +11716,7 @@
         "swarming": {
           "can_use_on_swarming_builders": false
         },
-        "test": "service_unittests"
+        "test": "services_unittests"
       },
       {
         "swarming": {
@@ -11735,7 +11735,7 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
-        "test": "service_unittests"
+        "test": "services_unittests"
       }
     ]
   },

diff --git a/testing/buildbot/chromium.gpu.fyi.json b/testing/buildbot/chromium.gpu.fyi.json
@@ -5565,7 +5565,7 @@
             }
           ]
         },
-        "test": "service_unittests",
+        "test": "services_unittests",
         "use_xvfb": false
       },
       {
@@ -5977,7 +5977,7 @@
             }
           ]
         },
-        "test": "service_unittests",
+        "test": "services_unittests",
         "use_xvfb": false
       }
     ],
@@ -6410,7 +6410,7 @@
             }
           ]
         },
-        "test": "service_unittests",
+        "test": "services_unittests",
         "use_xvfb": false
       }
     ],
@@ -6854,7 +6854,7 @@
             }
           ]
         },
-        "test": "service_unittests",
+        "test": "services_unittests",
         "use_xvfb": false
       }
     ],
@@ -7337,7 +7337,7 @@
             }
           ]
         },
-        "test": "service_unittests",
+        "test": "services_unittests",
         "use_xvfb": false
       },
       {
@@ -8601,7 +8601,7 @@
             }
           ]
         },
-        "test": "service_unittests",
+        "test": "services_unittests",
         "use_xvfb": false
       },
       {
@@ -9033,7 +9033,7 @@
             }
           ]
         },
-        "test": "service_unittests",
+        "test": "services_unittests",
         "use_xvfb": false
       },
       {
@@ -9449,7 +9449,7 @@
             }
           ]
         },
-        "test": "service_unittests",
+        "test": "services_unittests",
         "use_xvfb": false
       },
       {
@@ -9886,7 +9886,7 @@
             }
           ]
         },
-        "test": "service_unittests",
+        "test": "services_unittests",
         "use_xvfb": false
       },
       {
@@ -10351,7 +10351,7 @@
             }
           ]
         },
-        "test": "service_unittests",
+        "test": "services_unittests",
         "use_xvfb": false
       },
       {
@@ -10913,7 +10913,7 @@
             }
           ]
         },
-        "test": "service_unittests",
+        "test": "services_unittests",
         "use_xvfb": false
       },
       {
@@ -11040,7 +11040,7 @@
             }
           ]
         },
-        "test": "service_unittests",
+        "test": "services_unittests",
         "use_xvfb": false
       },
       {
@@ -11167,7 +11167,7 @@
             }
           ]
         },
-        "test": "service_unittests",
+        "test": "services_unittests",
         "use_xvfb": false
       },
       {
@@ -11294,7 +11294,7 @@
             }
           ]
         },
-        "test": "service_unittests",
+        "test": "services_unittests",
         "use_xvfb": false
       },
       {
@@ -11424,7 +11424,7 @@
             }
           ]
         },
-        "test": "service_unittests",
+        "test": "services_unittests",
         "use_xvfb": false
       },
       {
@@ -11554,7 +11554,7 @@
             }
           ]
         },
-        "test": "service_unittests",
+        "test": "services_unittests",
         "use_xvfb": false
       },
       {

diff --git a/testing/buildbot/chromium.linux.json b/testing/buildbot/chromium.linux.json
@@ -2806,7 +2806,7 @@
             }
           ]
         },
-        "test": "service_unittests"
+        "test": "services_unittests"
       },
       {
         "merge": {
@@ -4019,7 +4019,7 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
-        "test": "service_unittests"
+        "test": "services_unittests"
       },
       {
         "swarming": {
@@ -4674,7 +4674,7 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
-        "test": "service_unittests"
+        "test": "services_unittests"
       },
       {
         "swarming": {
@@ -5083,7 +5083,7 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
-        "test": "service_unittests"
+        "test": "services_unittests"
       },
       {
         "swarming": {

diff --git a/testing/buildbot/chromium.mac.json b/testing/buildbot/chromium.mac.json
@@ -337,7 +337,7 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
-        "test": "service_unittests"
+        "test": "services_unittests"
       },
       {
         "swarming": {
@@ -771,7 +771,7 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
-        "test": "service_unittests"
+        "test": "services_unittests"
       },
       {
         "swarming": {
@@ -1225,7 +1225,7 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
-        "test": "service_unittests"
+        "test": "services_unittests"
       },
       {
         "swarming": {
@@ -1643,7 +1643,7 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
-        "test": "service_unittests"
+        "test": "services_unittests"
       },
       {
         "swarming": {
@@ -2042,7 +2042,7 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
-        "test": "service_unittests"
+        "test": "services_unittests"
       },
       {
         "swarming": {

diff --git a/testing/buildbot/chromium.win.json b/testing/buildbot/chromium.win.json
@@ -389,7 +389,7 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
-        "test": "service_unittests"
+        "test": "services_unittests"
       },
       {
         "swarming": {
@@ -939,7 +939,7 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
-        "test": "service_unittests"
+        "test": "services_unittests"
       },
       {
         "swarming": {
@@ -1474,7 +1474,7 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
-        "test": "service_unittests"
+        "test": "services_unittests"
       },
       {
         "swarming": {
@@ -1938,7 +1938,7 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
-        "test": "service_unittests"
+        "test": "services_unittests"
       },
       {
         "swarming": {

diff --git a/testing/buildbot/client.v8.chromium.json b/testing/buildbot/client.v8.chromium.json
@@ -278,7 +278,7 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
-        "test": "service_unittests"
+        "test": "services_unittests"
       },
       {
         "swarming": {
@@ -619,7 +619,7 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
-        "test": "service_unittests"
+        "test": "services_unittests"
       },
       {
         "swarming": {

diff --git a/testing/buildbot/gn_isolate_map.pyl b/testing/buildbot/gn_isolate_map.pyl
@@ -833,8 +833,8 @@
     "label": "//services:service_junit_tests",
     "type": "junit_test",
   },
-  "service_unittests": {
-    "label": "//services:service_unittests",
+  "services_unittests": {
+    "label": "//services:services_unittests",
     "type": "windowed_test_launcher",
   },
   "setup_unittests": {
-Original file line number
+Diff line change
@@ Expand Up / @@ -1182,7 +1182,7 @@ @@
                 }
               ]
             },
-            "test": "service_unittests"
+            "test": "services_unittests"
           },
           {
             "merge": {
@@ Expand Down @@