Bug 826132 - Don't restart emulator on failure, r=ahal

testing/marionette/client/marionette/emulator.py

@@ -236,13 +236,6 @@ class Emulator(object):
                     online.add(m.group(1))
         return (online, offline)
 
-    def restart(self, port):
-        if not self._emulator_launched:
-            return
-        self.close()
-        self.start()
-        return self.setup_port_forwarding(port)
-
     def start_adb(self):
         result = self._run_adb(['start-server'])
         # We keep track of whether we've started adb or not, so we know

testing/marionette/client/marionette/marionette.py

@@ -210,10 +210,6 @@ class Marionette(object):
             self.session = None
             self.window = None
             self.client.close()
-            if self.emulator:
-                port = self.emulator.restart(self.local_port)
-                if port is not None:
-                    self.port = self.client.port = port
             raise TimeoutException(message='socket.timeout', status=ErrorCodes.TIMEOUT, stacktrace=None)
 
         # Process any emulator commands that are sent from a script