Update mojo sdk to rev 59145288bae55b0fce4276b017df6a1117bcf00f

mojo/public/tools/bindings/pylib/mojom_tests/parse/lexer_unittest.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import imp
 import os.path
 import sys
 import unittest
 
 def _GetDirAbove(dirname):
   """Returns the directory "above" this file containing |dirname| (which must
   also be "above" this file)."""
   path = os.path.abspath(__file__)
   while True:
     path, tail = os.path.split(path)
     assert tail
     if tail == dirname:
       return path
 
 try:
   imp.find_module("ply")
 except ImportError:
-  sys.path.append(os.path.join(_GetDirAbove("mojo"), "third_party"))
+  sys.path.append(os.path.join(_GetDirAbove("public"), "public/third_party"))
 from ply import lex
 
 try:
   imp.find_module("mojom")
 except ImportError:
   sys.path.append(os.path.join(_GetDirAbove("pylib"), "pylib"))
 import mojom.parse.lexer
 
 
 # This (monkey-patching LexToken to make comparison value-based) is evil, but
@@ skipping 29 matching lines @@
   def testValidKeywords(self):
     """Tests valid keywords."""
     self.assertEquals(self._SingleTokenForInput("handle"),
                       _MakeLexTokenForKeyword("handle"))
     self.assertEquals(self._SingleTokenForInput("import"),
                       _MakeLexTokenForKeyword("import"))
     self.assertEquals(self._SingleTokenForInput("module"),
                       _MakeLexTokenForKeyword("module"))
     self.assertEquals(self._SingleTokenForInput("struct"),
                       _MakeLexTokenForKeyword("struct"))
+    self.assertEquals(self._SingleTokenForInput("union"),
+                      _MakeLexTokenForKeyword("union"))
     self.assertEquals(self._SingleTokenForInput("interface"),
                       _MakeLexTokenForKeyword("interface"))
     self.assertEquals(self._SingleTokenForInput("enum"),
                       _MakeLexTokenForKeyword("enum"))
     self.assertEquals(self._SingleTokenForInput("const"),
                       _MakeLexTokenForKeyword("const"))
     self.assertEquals(self._SingleTokenForInput("true"),
                       _MakeLexTokenForKeyword("true"))
     self.assertEquals(self._SingleTokenForInput("false"),
                       _MakeLexTokenForKeyword("false"))
@@ skipping 96 matching lines @@
   def _SingleTokenForInput(self, input_string):
     """Gets the single token for the given input string. (Raises an exception if
     the input string does not result in exactly one token.)"""
     toks = self._TokensForInput(input_string)
     assert len(toks) == 1
     return toks[0]
 
 
 if __name__ == "__main__":
   unittest.main()