Update cros_mark_as_stable_unittest.py to pass again.

cros_mark_as_stable_unittest.py

 #!/usr/bin/python
 
 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Unit tests for cros_mark_as_stable.py."""
 
 
 import mox
@@ skipping 98 matching lines @@
     self.assertEquals(ebuild.package, self.package)
     self.assertEquals(ebuild.ebuild_path, self.ebuild_path)
     self.assertEquals(ebuild.ebuild_path_no_revision,
                       '/path/test_package-0.0.1')
     self.assertEquals(ebuild.ebuild_path_no_version, '/path/test_package')
     self.assertEquals(ebuild.current_revision, 1)
     self.assertEquals(ebuild.commit_id, 'my_id')
 
   def testFindEBuildPath(self):
     self.mox.StubOutWithMock(cros_mark_as_stable, '_SimpleRunCommand')
-    cros_mark_as_stable._SimpleRunCommand(
-        'equery-x86-generic which %s 2> /dev/null' % self.package).AndReturn(
-            self.ebuild_path)
+    cmd = ('ACCEPT_KEYWORDS="x86 arm amd64" '
+           'equery-x86-generic which %s 2> /dev/null')
+    cros_mark_as_stable._SimpleRunCommand(cmd % self.package).AndReturn(
+        self.ebuild_path)
     self.mox.ReplayAll()
     path = cros_mark_as_stable._EBuild._FindEBuildPath(self.package)
     self.mox.VerifyAll()
     self.assertEquals(path, self.ebuild_path)
 
   def testParseEBuildPath(self):
     # Test with ebuild with revision number.
     no_rev, no_version, revision = cros_mark_as_stable._EBuild._ParseEBuildPath(
         self.ebuild_path)
     self.assertEquals(no_rev, '/path/test_package-0.0.1')
@@ skipping 63 matching lines @@
     #cros_mark_as_stable._SimpleRunCommand('git push')
     #self.mox.ReplayAll()
     #marker = cros_mark_as_stable.EBuildStableMarker(self.m_ebuild)
     #marker.PushChange()
     #self.mox.VerifyAll()
     pass
 
 
 if __name__ == '__main__':
   unittest.main()