[NaCl SDK] getos.py now checks against the Cr-Commit-Position.

native_client_sdk/src/tools/tests/getos_test.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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 os
 import shutil
 import sys
 import tempfile
 import unittest
@@ skipping 99 matching lines @@
     self.patch = mock.patch.dict('os.environ',
                                   {'NACL_SDK_ROOT': self.tempdir})
     self.patch.start()
 
   def tearDown(self):
     shutil.rmtree(self.tempdir)
     self.patch.stop()
 
   def testGetSDKVersion(self):
     """correctly parses README to find SDK version."""
-    expected_version = (16, '196')
+    expected_version = (16, '0a1b2c3d')
     with open(os.path.join(self.tempdir, 'README'), 'w') as out:
       out.write('Version: %s\n' % expected_version[0])
       out.write('Chrome Revision: %s\n' % expected_version[1])
 
     version = getos.GetSDKVersion()
     self.assertEqual(version, expected_version)
 
+  def testCheckVersion(self):
+    """correctly rejects SDK versions earlier than the required one."""
+    actual_version = (16, '0a1b2c3d')

[binji, 2014/08/27 01:05:02]

See https://codereview.chromium.org/507883003/

I don't think we want to use a git hash. After this lands, we should be able to
use the commit position as if it were an SVN revision.

Thanks for adding a test, though!

[Matt Giuca, 2014/08/27 01:17:50]

Oh OK, cool. I was expecting we would end up with the string of the format:
"Chrome Revision: GITHASH-COMMITPOSITION"

which is what you'd get if you used lastchange after those guys sort out
Cr-Commit-Position (see https://codereview.chromium.org/488733002, which has
since been reverted but will presumably be added back at some point).

So I was planning to parse the commit position out of that and use it in
CheckVersion. I'll wait for your other CL to land and then update these tests to
match.

+    with open(os.path.join(self.tempdir, 'README'), 'w') as out:
+      out.write('Version: %s\n' % actual_version[0])
+      out.write('Chrome Revision: %s\n' % actual_version[1])
+
+    required_version = (15, 196)
+    getos.CheckVersion(required_version)
+
+    # Note: The revision part is currently ignored due to Git; see
+    # http://crbug.com/406993.
+    required_version = (16, 196)
+    getos.CheckVersion(required_version)
+
+    required_version = (17, 196)
+    self.assertRaisesRegexp(
+        getos.Error,
+        r'SDK version too old \(current: 16, required: 17\)',
+        getos.CheckVersion,
+        required_version)
+
 
 if __name__ == '__main__':
   unittest.main()