Rename last two virtual test suites to complete VirtualTestSuite refactoring.

Tools/Scripts/webkitpy/layout_tests/port/base_unittest.py

 # Copyright (C) 2010 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #    * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #    * Redistributions in binary form must reproduce the above
 # copyright notice, this list of conditions and the following disclaimer
@@ skipping 344 matching lines @@
         self.assertEqual('httpd seems broken. Cannot run http tests.\n', logs)
 
     def test_test_exists(self):
         port = self.make_port(with_tests=True)
         self.assertTrue(port.test_exists('passes'))
         self.assertTrue(port.test_exists('passes/text.html'))
         self.assertFalse(port.test_exists('passes/does_not_exist.html'))
 
         self.assertTrue(port.test_exists('virtual'))
         self.assertFalse(port.test_exists('virtual/does_not_exist.html'))
-        self.assertTrue(port.test_exists('virtual/passes/text.html'))
+        self.assertTrue(port.test_exists('virtual/virtual_passes/passes/text.html'))
 
     def test_test_isfile(self):
         port = self.make_port(with_tests=True)
         self.assertFalse(port.test_isfile('passes'))
         self.assertTrue(port.test_isfile('passes/text.html'))
         self.assertFalse(port.test_isfile('passes/does_not_exist.html'))
 
         self.assertFalse(port.test_isfile('virtual'))
-        self.assertTrue(port.test_isfile('virtual/passes/text.html'))
+        self.assertTrue(port.test_isfile('virtual/virtual_passes/passes/text.html'))
         self.assertFalse(port.test_isfile('virtual/does_not_exist.html'))
 
     def test_test_isdir(self):
         port = self.make_port(with_tests=True)
         self.assertTrue(port.test_isdir('passes'))
         self.assertFalse(port.test_isdir('passes/text.html'))
         self.assertFalse(port.test_isdir('passes/does_not_exist.html'))
         self.assertFalse(port.test_isdir('passes/does_not_exist/'))
 
         self.assertTrue(port.test_isdir('virtual'))
         self.assertFalse(port.test_isdir('virtual/does_not_exist.html'))
         self.assertFalse(port.test_isdir('virtual/does_not_exist/'))
-        self.assertFalse(port.test_isdir('virtual/passes/text.html'))
+        self.assertFalse(port.test_isdir('virtual/virtual_passes/passes/text.html'))
 
     def test_tests(self):
         port = self.make_port(with_tests=True)
         tests = port.tests([])
         self.assertIn('passes/text.html', tests)
-        self.assertIn('virtual/passes/text.html', tests)
+        self.assertIn('virtual/virtual_passes/passes/text.html', tests)
 
         tests = port.tests(['passes'])
         self.assertIn('passes/text.html', tests)
-        self.assertIn('passes/passes/test-virtual-passes.html', tests)
-        self.assertNotIn('virtual/passes/text.html', tests)
+        self.assertIn('passes/virtual_passes/test-virtual-passes.html', tests)
+        self.assertNotIn('virtual/virtual_passes/passes/text.html', tests)
 
-        tests = port.tests(['virtual/passes'])
+        tests = port.tests(['virtual/virtual_passes/passes'])
         self.assertNotIn('passes/text.html', tests)
-        self.assertIn('virtual/passes/test-virtual-passes.html', tests)
-        self.assertIn('virtual/passes/passes/test-virtual-passes.html', tests)
-        self.assertNotIn('virtual/passes/test-virtual-virtual/passes.html', tests)
-        self.assertNotIn('virtual/passes/virtual/passes/test-virtual-passes.html', tests)
+        self.assertIn('virtual/virtual_passes/passes/test-virtual-passes.html', tests)
+        self.assertNotIn('passes/test-virtual-passes.html', tests)
+        self.assertNotIn('virtual/virtual_passes/passes/test-virtual-virtual/passes.html', tests)
+        self.assertNotIn('virtual/virtual_passes/passes/virtual_passes/passes/test-virtual-passes.html', tests)
 
     def test_build_path(self):
         port = self.make_port(options=optparse.Values({'build_directory': '/my-build-directory/'}))
         self.assertEqual(port._build_path(), '/my-build-directory/Release')
 
     def test_dont_require_http_server(self):
         port = self.make_port()
         self.assertEqual(port.requires_http_server(), False)
 
     def test_can_load_actual_virtual_test_suite_file(self):
         port = Port(SystemHost(), 'baseport')
 
         # If this call returns successfully, we found and loaded the LayoutTests/VirtualTestSuites.
         _ = port.virtual_test_suites()
 
     def test_good_virtual_test_suite_file(self):
         port = self.make_port()
         fs = port._filesystem
         fs.write_text_file(fs.join(port.layout_tests_dir(), 'VirtualTestSuites'),
-                           '[{"prefix": "foo", "base": "fast/foo", "args": ["--foo"]},'
-                           '{"name": "bar", "base": "fast/bar", "args": ["--bar"]}]')
+                           '[{"prefix": "bar", "base": "fast/bar", "args": ["--bar"]}]')
 
         # If this call returns successfully, we found and loaded the LayoutTests/VirtualTestSuites.
         _ = port.virtual_test_suites()
 
     def test_virtual_test_suite_file_is_not_json(self):
         port = self.make_port()
         fs = port._filesystem
         fs.write_text_file(fs.join(port.layout_tests_dir(), 'VirtualTestSuites'),
                            '{[{[')
         self.assertRaises(ValueError, port.virtual_test_suites)
@@ skipping 48 matching lines @@
 
 class VirtualTestSuiteTest(unittest.TestCase):
     def test_basic(self):
         suite = VirtualTestSuite(prefix='suite', base='base/foo', args=['--args'])
         self.assertEqual(suite.name, 'virtual/suite/base/foo')
         self.assertEqual(suite.base, 'base/foo')
         self.assertEqual(suite.args, ['--args'])
 
     def test_no_slash(self):
         self.assertRaises(AssertionError, VirtualTestSuite, prefix='suite/bar', base='base/foo', args=['--args'])
-
-    def test_legacy(self):
-        suite = VirtualTestSuite(name='suite/bar', base='base/foo', args=['--args'])
-        self.assertEqual(suite.name, 'virtual/suite/bar')
-        self.assertEqual(suite.base, 'base/foo')
-        self.assertEqual(suite.args, ['--args'])