[ Observatory ] Remove legacy Observatory VM service tests

Clean up test_runner and the test matrix to remove all references to
the service test suite and delete the tests.

Work towards #50233

TEST=N/A

Change-Id: Ie3adb0d007d71f9a223843d739e57cbdb5be0d59
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/429140
Reviewed-by: Siva Annamalai <[email protected]>
Commit-Queue: Ben Konyi <[email protected]>
Reviewed-by: Ivan Inozemtsev <[email protected]>

Author: bkonyi

PRESUBMIT.py

@@ -485,27 +485,6 @@ def _CheckCopyrightYear(input_api, output_api):
     ]
 
 
-def _CheckNoNewObservatoryServiceTests(input_api, output_api):
-    """Ensures that no new tests are added to the Observatory test suite."""
-    files = []
-
-    for f in input_api.AffectedFiles(include_deletes=False):
-        path = f.LocalPath()
-        if is_dart_file(path) and path.startswith(
-                "runtime/observatory/tests/service/") and f.Action(
-                ) == 'A' and os.path.isfile(path):
-            files.append(path)
-
-    if not files:
-        return []
-
-    return [
-        output_api.PresubmitError(
-            'New VM service tests should be added to pkg/vm_service/test, ' +
-            'not runtime/observatory/tests/service:\n' + '\n'.join(files))
-    ]
-
-
 def _CheckDevCompilerSync(input_api, output_api):
     """Make sure that any changes in the original and the temporary forked
     version of the DDC compiler are kept in sync. If a CL touches the
@@ -571,7 +550,6 @@ def _CommonChecks(input_api, output_api):
         input_api.canned_checks.CheckPatchFormatted(input_api, output_api))
     results.extend(_CheckCopyrightYear(input_api, output_api))
     results.extend(_CheckAnalyzerFiles(input_api, output_api))
-    results.extend(_CheckNoNewObservatoryServiceTests(input_api, output_api))
     results.extend(_CheckDevCompilerSync(input_api, output_api))
     results.extend(_CheckDartApiWinCSync(input_api, output_api))
     return results

pkg/test_runner/lib/src/test_configurations.dart

@@ -29,8 +29,6 @@ export 'configuration.dart' show TestConfiguration;
 /// here, if possible.
 final testSuiteDirectories = [
   Path('pkg'),
-  Path('runtime/observatory/tests/observatory_ui'),
-  Path('runtime/observatory/tests/service'),
   Path('runtime/tests/vm'),
   Path('samples'),
   Path('tests/corelib'),

pkg/test_runner/lib/src/test_suite.dart

@@ -756,8 +756,6 @@ class StandardTestSuite extends TestSuite {
       _enqueueStandardTest(testFile, expectationSet, onTest);
     } else if (configuration.runtime.isBrowser) {
       _enqueueBrowserTest(testFile, expectationSet, onTest);
-    } else if (suiteName == 'service') {
-      _enqueueServiceTest(testFile, expectationSet, onTest);
     } else {
       _enqueueStandardTest(testFile, expectationSet, onTest);
     }
@@ -789,44 +787,6 @@ class StandardTestSuite extends TestSuite {
     }
   }
 
-  void _enqueueServiceTest(
-      TestFile testFile, Set<Expectation> expectations, TestCaseEvent onTest) {
-    var commonArguments = _commonArgumentsFromFile(testFile);
-
-    var vmOptionsList = getVmOptions(testFile);
-    assert(vmOptionsList.isNotEmpty);
-
-    var emitDdsTest = false;
-    for (var i = 0; i < 2; ++i) {
-      for (var vmOptionsVariant = 0;
-          vmOptionsVariant < vmOptionsList.length;
-          vmOptionsVariant++) {
-        var vmOptions = [
-          ...vmOptionsList[vmOptionsVariant],
-          ...extraVmOptions,
-          if (emitDdsTest) '-DUSE_DDS=true',
-          if (configuration.serviceResponseSizesDirectory != null)
-            '-DSERVICE_RESPONSE_SIZES_DIR=${configuration.serviceResponseSizesDirectory}',
-        ];
-        var isCrashExpected = expectations.contains(Expectation.crash);
-        var commands = _makeCommands(
-            testFile,
-            vmOptionsVariant + (vmOptionsList.length * i),
-            vmOptions,
-            commonArguments,
-            isCrashExpected);
-        var variantTestName =
-            '${testFile.name}/${emitDdsTest ? 'dds' : 'service'}';
-        if (vmOptionsList.length > 1) {
-          variantTestName = "${variantTestName}_$vmOptionsVariant";
-        }
-
-        _addTestCase(testFile, variantTestName, commands, expectations, onTest);
-      }
-      emitDdsTest = true;
-    }
-  }
-
   List<Command> _makeCommands(TestFile testFile, int vmOptionsVariant,
       List<String> vmOptions, List<String> args, bool isCrashExpected) {
     var commands = <Command>[];

pkg/test_runner/test/options_test.dart

@@ -160,14 +160,7 @@ TestConfiguration parseConfiguration(List<String> arguments) {
 
 List<TestConfiguration> parseConfigurations(List<String> arguments) {
   var parser = OptionsParser('pkg/test_runner/test/test_matrix.json');
-  var configurations = parser.parse(arguments);
-
-  // By default, without an explicit selector, you get two configurations, one
-  // for observatory_ui, and one for all the other selectors. Discard the
-  // observatory one to keep things simpler.
-  configurations
-      .removeWhere((config) => config.selectors.containsKey('observatory_ui'));
-  return configurations;
+  return parser.parse(arguments);
 }
 
 void expectValidationError(List<String> arguments, String error) {

pkg/test_runner/test/test_suite_test.dart

@@ -12,7 +12,6 @@ import 'utils.dart';
 void main() {
   testNnbdRequirements();
   testVmOptions();
-  testServiceTestVmOptions();
 }
 
 void testNnbdRequirements() {
@@ -65,38 +64,6 @@ void testVmOptions() {
       ]);
 }
 
-void testServiceTestVmOptions() {
-  // Note: The backslashes are to avoid the test_runner thinking these are
-  // Requirements markers for this file itself.
-  var testFiles = [
-    createTestFile(
-        source: "", path: "service_no_options_test.dart", suite: "service"),
-    createTestFile(
-        source: "/\/ VMOptions=--a",
-        path: "service_one_option_test.dart",
-        suite: "service"),
-    createTestFile(
-        source: "/\/ VMOptions=--a --b\n/\/ VMOptions=--c",
-        path: "service_options_test.dart",
-        suite: "service"),
-  ];
-
-  expectTestCases(
-      [],
-      testFiles,
-      [
-        "service/service_no_options_test/service",
-        "service/service_no_options_test/dds",
-        "service/service_one_option_test/service",
-        "service/service_one_option_test/dds",
-        "service/service_options_test/service_0",
-        "service/service_options_test/service_1",
-        "service/service_options_test/dds_0",
-        "service/service_options_test/dds_1",
-      ],
-      suite: "service");
-}
-
 void expectTestCases(List<String> options, List<TestFile> testFiles,
     List<String> expectedCaseNames,
     {String suite = "language"}) {

pubspec.yaml

@@ -311,8 +311,6 @@ dependency_overrides:
     path: third_party/pkg/tools/pkgs/io
   devtools_shared:
     path: third_party/devtools/devtools_shared
-  observatory_test_package:
-    path: runtime/observatory/tests/service/observatory_test_package
   # heapsnapshot has dependencies from outside the sdk, so cannot be part of
   # the workspace. https://github.com/dart-lang/sdk/issues/50061
   heapsnapshot: