Restart codereview issue 6792042

buildbot/cbuildbot_stages_unittest.py

Index: buildbot/cbuildbot_stages_unittest.py
diff --git a/buildbot/cbuildbot_stages_unittest.py b/buildbot/cbuildbot_stages_unittest.py
index eaad958f869a12bfea8e88cf095acda8372404ca..d1405f6827738965bd5ce5a95d7b31440a21c1e0 100755
--- a/buildbot/cbuildbot_stages_unittest.py
+++ b/buildbot/cbuildbot_stages_unittest.py
@@ -622,21 +622,23 @@ class BuildTargetStageTest(AbstractStageTest):
     self.options.tests = True
     self.build_config['build_type'] = 'full'
     self.build_config['usepkg'] = True
+    self.build_config['useflags'] = ['ALPHA', 'BRAVO', 'CHARLIE']
+    proper_env = {'USE' : ' '.join(self.build_config['useflags'])}
 
     stages.BuilderStage._GetPortageEnvVar('FULL_BINHOST').AndReturn('new.com')
     stages.BuilderStage.old_binhost = 'old.com'
 
     commands.Build(
-        self.build_root, True,
-        build_autotest=True, usepkg=True)
+        self.build_root, True, build_autotest=True, usepkg=True,
+        extra_env=proper_env)
 
     commands.UploadPrebuilts(
         self.build_root, self.build_config['board'],
         self.build_config['rev_overlays'], [],
         self.build_config['build_type'], False)
 
-    commands.BuildImage(self.build_root)
-    commands.BuildVMImageForTesting(self.build_root)
+    commands.BuildImage(self.build_root, extra_env=proper_env)
+    commands.BuildVMImageForTesting(self.build_root, extra_env=proper_env)
 
     self.mox.ReplayAll()
     self.RunStage()
@@ -646,9 +648,11 @@ class BuildTargetStageTest(AbstractStageTest):
     """Make sure our logic for Build arguments can toggle to false."""
     stages.BuilderStage._GetPortageEnvVar('FULL_BINHOST').AndReturn('new.com')
     stages.BuilderStage.old_binhost = 'new.com'
+    self.build_config['useflags'] = None
 
-    commands.Build(self.build_root, False, build_autotest=False, usepkg=False)
-    commands.BuildImage(self.build_root)
+    commands.Build(self.build_root, False, build_autotest=False, usepkg=False,
+        extra_env=None)
+    commands.BuildImage(self.build_root, extra_env=None)
 
     self.mox.ReplayAll()
     self.RunStage()
@@ -658,12 +662,14 @@ class BuildTargetStageTest(AbstractStageTest):
     """Verify emptytree flag is false when there is no old binhost."""
     stages.BuilderStage._GetPortageEnvVar('FULL_BINHOST').AndReturn('new.com')
     stages.BuilderStage.old_binhost = False
+    self.build_config['useflags'] = ['BAKER']
+    proper_env = {'USE' : ' '.join(self.build_config['useflags'])}
 
     commands.Build(
         self.build_root, False,
-        build_autotest=False, usepkg=False)
+        build_autotest=False, usepkg=False, extra_env=proper_env)
 
-    commands.BuildImage(self.build_root)
+    commands.BuildImage(self.build_root, extra_env=proper_env)
 
     self.mox.ReplayAll()
     self.RunStage()