Rename last two virtual test suites to complete VirtualTestSuite refactoring.

Tools/Scripts/webkitpy/layout_tests/port/test.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 191 matching lines @@
 
     # Text output files contain "\r\n" on Windows.  This may be
     # helpfully filtered to "\r\r\n" by our Python/Cygwin tooling.
     tests.add('passes/text.html',
               expected_text='\nfoo\n\n', actual_text='\nfoo\r\n\r\r\n')
 
     # For reftests.
     tests.add_reftest('passes/reftest.html', 'passes/reftest-expected.html', same_image=True)
 
     # This adds a different virtual reference to ensure that that also works.
-    tests.add('virtual/passes/reftest-expected.html', actual_checksum='xxx', actual_image='XXX', is_reftest=True)
+    tests.add('virtual/virtual_passes/passes/reftest-expected.html', actual_checksum='xxx', actual_image='XXX', is_reftest=True)
 
     tests.add_reftest('passes/mismatch.html', 'passes/mismatch-expected-mismatch.html', same_image=False)
     tests.add_reftest('passes/svgreftest.svg', 'passes/svgreftest-expected.svg', same_image=True)
     tests.add_reftest('passes/xhtreftest.xht', 'passes/xhtreftest-expected.html', same_image=True)
     tests.add_reftest('passes/phpreftest.php', 'passes/phpreftest-expected-mismatch.svg', same_image=False)
     tests.add_reftest('failures/expected/reftest.html', 'failures/expected/reftest-expected.html', same_image=False)
     tests.add_reftest('failures/expected/mismatch.html', 'failures/expected/mismatch-expected-mismatch.html', same_image=True)
     tests.add_reftest('failures/unexpected/crash-reftest.html', 'failures/unexpected/crash-reftest-expected.html', same_image=True, crash=True)
     tests.add_reftest('failures/unexpected/reftest.html', 'failures/unexpected/reftest-expected.html', same_image=False)
     tests.add_reftest('failures/unexpected/mismatch.html', 'failures/unexpected/mismatch-expected-mismatch.html', same_image=True)
@@ skipping 32 matching lines @@
     tests.add('failures/unexpected/pixeldir/image_in_pixeldir.html',
         actual_image='image_in_pixeldir-pngtEXtchecksum\x00checksum_fail',
         expected_image='image_in_pixeldir-pngtEXtchecksum\x00checksum-png')
     tests.add('failures/unexpected/image_not_in_pixeldir.html',
         actual_image='image_not_in_pixeldir-pngtEXtchecksum\x00checksum_fail',
         expected_image='image_not_in_pixeldir-pngtEXtchecksum\x00checksum-png')
 
     # For testing that virtual test suites don't expand names containing themselves
     # See webkit.org/b/97925 and base_unittest.PortTest.test_tests().
     tests.add('passes/test-virtual-passes.html')
-    tests.add('passes/passes/test-virtual-passes.html')
+    tests.add('passes/virtual_passes/test-virtual-passes.html')
 
     return tests
 
 
 # Here we use a non-standard location for the layout tests, to ensure that
 # this works. The path contains a '.' in the name because we've seen bugs
 # related to this before.
 
 LAYOUT_TEST_DIR = '/test.checkout/LayoutTests'
 PERF_TEST_DIR = '/test.checkout/PerformanceTests'
@@ skipping 70 matching lines @@
     for test in test_list.tests.values():
         add_file(test, test.name[test.name.rfind('.'):], '')
         if test.is_reftest:
             continue
         if test.actual_audio:
             add_file(test, '-expected.wav', test.expected_audio)
             continue
         add_file(test, '-expected.txt', test.expected_text)
         add_file(test, '-expected.png', test.expected_image)
 
-    filesystem.write_text_file(filesystem.join(LAYOUT_TEST_DIR, 'virtual', 'passes', 'args-expected.txt'), 'args-txt --virtual-arg')
+    filesystem.write_text_file(filesystem.join(LAYOUT_TEST_DIR, 'virtual', 'virtual_passes', 'passes', 'args-expected.txt'), 'args-txt --virtual-arg')
     # Clear the list of written files so that we can watch what happens during testing.
     filesystem.clear_written_files()
 
 
 class TestPort(Port):
     port_name = 'test'
     default_port_name = 'test-mac-leopard'
 
     """Test implementation of the Port interface."""
     ALL_BASELINE_VARIANTS = (
@@ skipping 91 matching lines @@
 
     def perf_tests_dir(self):
         return PERF_TEST_DIR
 
     def webkit_base(self):
         return '/test.checkout'
 
     def _skipped_tests_for_unsupported_features(self, test_list):
         return set(['failures/expected/skip_text.html',
                     'failures/unexpected/skip_pass.html',
-                    'virtual/skipped'])
+                    'virtual/skipped/failures/expected'])
 
     def name(self):
         return self._name
 
     def operating_system(self):
         return self._operating_system
 
     def _path_to_wdiff(self):
         return None
 
@@ skipping 62 matching lines @@
 
     def configuration_specifier_macros(self):
         """To avoid surprises when introducing new macros, these are intentionally fixed in time."""
         return {'mac': ['leopard', 'snowleopard'], 'win': ['xp', 'win7'], 'linux': ['lucid']}
 
     def all_baseline_variants(self):
         return self.ALL_BASELINE_VARIANTS
 
     def virtual_test_suites(self):
         return [
-            VirtualTestSuite(name='passes', base='passes', args=['--virtual-arg']),
-            VirtualTestSuite(name='skipped', base='failures/expected', args=['--virtual-arg2']),
+            VirtualTestSuite(prefix='virtual_passes', base='passes', args=['--virtual-arg']),
+            VirtualTestSuite(prefix='skipped', base='failures/expected', args=['--virtual-arg2']),
         ]
 
 
 class TestDriver(Driver):
     """Test/Dummy implementation of the driver interface."""
     next_pid = 1
 
     def __init__(self, *args, **kwargs):
         super(TestDriver, self).__init__(*args, **kwargs)
         self.started = False
@@ skipping 74 matching lines @@
         else:
             image = test.actual_image
         return DriverOutput(actual_text, image, test.actual_checksum, audio,
             crash=(crash or web_process_crash), crashed_process_name=crashed_process_name,
             crashed_pid=crashed_pid, crash_log=crash_log,
             test_time=time.time() - start_time, timeout=test.timeout, error=test.error, pid=self.pid,
             leak=test.leak)
 
     def stop(self):
         self.started = False