Merge pull request google#8 from erock2112/master

Fix high_test after 65dec86

Author: maruel

high_test.py

@@ -30,7 +30,7 @@ def __init__(self, cmds):
   def IsShellOk(self, cmd):  # pylint: disable=unused-argument
     return True
 
-  def Shell(self, cmd):
+  def Shell(self, cmd, timeout_ms=None):
     data = self._cmds.pop(0)
     assert data[0] == cmd, (data, cmd)
     return data[1], 0