Fix _GEN_TEST_CACHE.

recipe_engine/simulation_test.py

 # Copyright 2014 The LUCI Authors. All rights reserved.
 # Use of this source code is governed under the Apache License, Version 2.0
 # that can be found in the LICENSE file.
 
 """Provides simulator test coverage for individual recipes."""
 
 import StringIO
 import ast
 import contextlib
 import copy
@@ skipping 75 matching lines @@
 # RunRecipe so that it can persist between RunRecipe calls in the same process.
 _GEN_TEST_CACHE = {}
 
 def RunRecipe(recipe_name, test_name):
   """Actually runs the recipe given the GenTests-supplied test_data."""
   from . import config_types
   from . import loader
   from . import run
   from . import step_runner
 
-  if recipe_name not in _GEN_TEST_CACHE:
+  cache_key = (recipe_name, test_name)
+  if cache_key not in _GEN_TEST_CACHE:
     recipe_script = _UNIVERSE.load_recipe(recipe_name)
     test_api = loader.create_test_api(recipe_script.LOADED_DEPS, _UNIVERSE)
     for test_data in recipe_script.gen_tests(test_api):
       _GEN_TEST_CACHE[(recipe_name, test_data.name)] = copy.deepcopy(test_data)
 
-  test_data = _GEN_TEST_CACHE[(recipe_name, test_name)]
+  test_data = _GEN_TEST_CACHE[cache_key]
 
   config_types.ResetTostringFns()
 
   annotator = SimulationAnnotatorStreamEngine()
   with stream.StreamEngineInvariants.wrap(annotator) as stream_engine:
     step_runner = step_runner.SimulationStepRunner(stream_engine, test_data,
                                                    annotator)
 
     props = test_data.properties.copy()
     props['recipe'] = recipe_name
@@ skipping 110 matching lines @@
       logging.warn("Ignoring %s environment variable." % env_var)
       os.environ.pop(env_var)
 
   global _UNIVERSE
   _UNIVERSE = universe
   global _ENGINE_FLAGS
   _ENGINE_FLAGS = engine_flags
 
   expect_tests.main('recipe_simulation_test', GenerateTests,
                     cover_omit=cover_omit(), args=args)