Remove references to NonMatchineMachines exception.

NonMatchingMachines was removed in a CL yesterday, but a few
references to it were missed.  This removes those references.

BUG=None
TEST=None

Change-Id: Iadc75d26bce6193d30c23c22b5fc1a529103b607
Reviewed-on: https://chrome-internal-review.googlesource.com/229501
Commit-Ready: Caroline Tice <cmtice@google.com>
Tested-by: Caroline Tice <cmtice@google.com>
Reviewed-by: Yunlian Jiang <yunlian@google.com>

1 files changed, 3 insertions, 11 deletions

diff --git a/crosperf/benchmark_run.py b/crosperf/benchmark_run.py
index c8b22000..f8bc3793 100644
--- a/crosperf/benchmark_run.py
+++ b/crosperf/benchmark_run.py
@@ -13,7 +13,6 @@ import traceback
 from utils import command_executer
 from utils import timeline
 
-from machine_manager import NonMatchingMachines
 from suite_runner import SuiteRunner
 from results_cache import MockResult
 from results_cache import MockResultsCache
@@ -170,16 +169,9 @@ class BenchmarkRun(threading.Thread):
       machine = None
       if self.terminated:
         raise Exception("Thread terminated while trying to acquire machine.")
-      try:
-        machine = self.machine_manager.AcquireMachine(self.label.chromeos_image,
-                                                      self.label,
-                                                      throw=True)
-
-      except NonMatchingMachines:
-        self.machine_manager.ForceSameImageToAllMachines(self.label)
-        machine = self.machine_manager.AcquireMachine(self.label.chromeos_image,
-                                                      self.label,
-                                                      throw=False)
+
+      machine = self.machine_manager.AcquireMachine(self.label.chromeos_image,
+                                                    self.label, throw=False)
 
       if machine:
         self._logger.LogOutput("%s: Machine %s acquired at %s" %