Test runner: More fixes.

tools/testrunner/network/network_execution.py

 # Copyright 2012 the V8 project authors. 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 in the documentation and/or other materials provided
@@ skipping 169 matching lines @@
         data, test_map = packet.Pack(self.binaries)
         compression.Send(data, sock)
         compression.Send(constants.END_OF_STREAM, sock)
         rec = compression.Receiver(sock)
         while not rec.IsDone() and not self.terminate:
           data_list = rec.Current()
           for data in data_list:
             test_id = data[0]
             if test_id < 0:
               # The peer is reporting an error.
-              print("Peer %s reports error: %s" % (peer.address, data[1]))
-              rec.Advance()
+              with self.lock:
+                print("\nPeer %s reports error: %s" % (peer.address, data[1]))
               continue
             test = test_map.pop(test_id)
             test.MergeResult(data)
             try:
               self.perfdata.UpdatePerfData(test)
             except Exception, e:
               print("UpdatePerfData exception: %s" % e)
               pass  # Just keep working.
             with self.lock:
               perf_key = self.perfdata.GetKey(test)
               compression.Send(
                   [constants.INFORM_DURATION, perf_key, test.duration,
                    self.context.arch, self.context.mode],
                   self.local_socket)
               self.indicator.AboutToRun(test)
               if test.suite.HasUnexpectedOutput(test):
                 self.failed.append(test)
                 if test.output.HasCrashed():
                   self.crashed += 1
               else:
                 self.succeeded += 1
               self.remaining -= 1
               self.indicator.HasRun(test)
           rec.Advance()
         peer.runtime = time.time() - start_time
-      except Exception:
+      except KeyboardInterrupt:
+        sock.close()
+        raise
+      except Exception, e:
+        print("Got exception: %s" % e)
         pass  # Fall back to local execution.
     else:
       compression.Send([constants.UNRESPONSIVE_PEER, peer.address],
                        self.local_socket)
     sock.close()
     if len(test_map) > 0:
       # Some tests have not received any results. Run them locally.
-      print("No results for %d tests, running them locally." % len(test_map))
+      print("\nNo results for %d tests, running them locally." % len(test_map))
       self._EnqueueLocally(test_map)
 
   def _EnqueueLocally(self, test_map):
     with self.tests_lock:
       for test in test_map:
         self.tests.append(test_map[test])
 
   def _AnalyzePeerRuntimes(self):
     total_runtime = 0.0
     total_work = 0.0
     for p in self.peers:
       if p.runtime is None:
         return
       total_runtime += p.runtime
       total_work += p.assigned_work
     for p in self.peers:
       p.assigned_work /= total_work
       p.runtime /= total_runtime
       perf_correction = p.assigned_work / p.runtime
       old_perf = p.relative_performance
       p.relative_performance = (old_perf + perf_correction) / 2.0
       compression.Send([constants.UPDATE_PERF, p.address,
                         p.relative_performance],
                        self.local_socket)