Revert of In run-webkit-tests, start xvfb if necessary.

third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/linux.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 47 matching lines @@
 
     def __init__(self, host, port_name, **kwargs):
         super(LinuxPort, self).__init__(host, port_name, **kwargs)
         self._version = port_name[port_name.index('linux-') + len('linux-'):]
         self._architecture = 'x86_64'
         assert self._version in self.SUPPORTED_VERSIONS
 
         if not self.get_option('disable_breakpad'):
             self._dump_reader = DumpReaderLinux(host, self._build_path())
         self._original_home = None
-        self._xvfb_process = None
 
     def additional_driver_flag(self):
         flags = super(LinuxPort, self).additional_driver_flag()
         if not self.get_option('disable_breakpad'):
             flags += ['--enable-crash-reporter', '--crash-dumps-dir=%s' % self._dump_reader.crash_dumps_directory()]
         return flags
 
     def check_build(self, needs_http, printer):
         result = super(LinuxPort, self).check_build(needs_http, printer)
 
@@ skipping 19 matching lines @@
         # The Apache binary path can vary depending on OS and distribution
         # See http://wiki.apache.org/httpd/DistrosDefaultLayout
         for path in ['/usr/sbin/httpd', '/usr/sbin/apache2']:
             if self._filesystem.exists(path):
                 return path
         _log.error('Could not find apache. Not installed or unknown path.')
         return None
 
     def setup_test_run(self):
         super(LinuxPort, self).setup_test_run()
-        self._start_xvfb()
         self._setup_dummy_home_dir()
 
     def clean_up_test_run(self):
         super(LinuxPort, self).clean_up_test_run()
-        self._stop_xvfb()
         self._clean_up_dummy_home_dir()
 
     #
     # PROTECTED METHODS
     #
 
     def _setup_dummy_home_dir(self):
         """Creates a dummy home directory for running the test.
 
         This is a workaround for crbug.com/595504; see crbug.com/612730.
@@ skipping 14 matching lines @@
                 continue
             fs.copyfile(original_path, fs.join(dummy_home, filename))
 
     def _clean_up_dummy_home_dir(self):
         """Cleans up the dummy dir and resets the HOME environment variable."""
         dummy_home = self.host.environ['HOME']
         assert dummy_home != self._original_home
         self._filesystem.rmtree(dummy_home)
         self.host.environ['HOME'] = self._original_home
 
-    def _start_xvfb(self):
-        display = self._find_display()
-        if not display:
-            _log.warn('Failed to find a free display to start Xvfb.')
-            return
-
-        _log.info('Starting Xvfb with display "%s".', display)
-        self._xvfb_process = self.host.executive.popen(
-            ['Xvfb', display, '-screen', '0', '1280x800x24', '-ac', '-dpi', '96'],
-            stderr=self.host.executive.DEVNULL)
-
-        # By setting DISPLAY here, the individual worker processes will
-        # get the right DISPLAY. Note, if this environment could be passed
-        # when creating workers, then we wouldn't need to modify DISPLAY here.
-        self.host.environ['DISPLAY'] = display
-
-        # The poll() method will return None if the process has not terminated:
-        # https://docs.python.org/2/library/subprocess.html#subprocess.Popen.poll
-        if self._xvfb_process.poll() is not None:
-            _log.warn('Failed to start Xvfb on display "%s."', display)
-
-    def _find_display(self):
-        """Tries to find a free X display, looping if necessary."""
-        # The "xvfb-run" command uses :99 by default.
-        for display_number in range(99, 120):
-            display = ':%d' % display_number
-            exit_code = self.host.executive.run_command(
-                ['xdpyinfo', '-display', display], return_exit_code=True)
-            if exit_code == 1:
-                return display
-        return None
-
-    def _stop_xvfb(self):
-        if not self._xvfb_process:
-            return
-        _log.debug('Killing Xvfb process pid %d.', self._xvfb_process.pid)
-        self._xvfb_process.kill()
-        self._xvfb_process.wait()
-
     def _path_to_driver(self, target=None):
         binary_name = self.driver_name()
         return self._build_path_with_target(target, binary_name)