update_nacl_manifest improvements

native_client_sdk/src/build_tools/tests/test_update_nacl_manifest.py

Index: native_client_sdk/src/build_tools/tests/test_update_nacl_manifest.py
diff --git a/native_client_sdk/src/build_tools/tests/test_update_nacl_manifest.py b/native_client_sdk/src/build_tools/tests/test_update_nacl_manifest.py
index 5d2525b37eaeebc6d55ea0d28616b50a2f311463..2132ee0fc2c1dbebdf0f834d667cfcbbf9178eb5 100755
--- a/native_client_sdk/src/build_tools/tests/test_update_nacl_manifest.py
+++ b/native_client_sdk/src/build_tools/tests/test_update_nacl_manifest.py
@@ -5,10 +5,12 @@
 
 import copy
 import datetime
+import hashlib
 import os
 import posixpath
 import subprocess
 import sys
+import tempfile
 import unittest
 import urlparse
 
@@ -158,6 +160,7 @@ class TestDelegate(update_nacl_manifest.Delegate):
     self.history = history
     self.files = files
     self.version_mapping = version_mapping
+    self.dryrun = 0
 
   def GetRepoManifest(self):
     return self.manifest
@@ -513,11 +516,37 @@ mac,canary,21.0.1156.0,2012-05-30 12:14:21.305090"""
     self.assertEqual(len(self.uploaded_manifest.GetBundles()), 1)
 
 
-def main():
-  suite = unittest.defaultTestLoader.loadTestsFromModule(sys.modules[__name__])
-  result = unittest.TextTestRunner(verbosity=2).run(suite)
+class TestUpdateVitals(unittest.TestCase):
+
+  def setUp(self):
+    f = tempfile.NamedTemporaryFile('w', prefix="test_update_nacl_manifest")
+    self.test_file = f.name
+    f.close()
+    test_data = "Some test data\n"
+    self.sha1 = hashlib.sha1(test_data).hexdigest()
+    with open(self.test_file, 'w') as f:
+      f.write(test_data)
+
+  def tearDown(self):
+    os.remove(self.test_file)
+
+  def testUpdateVitals(self):
+    self.manifest = MakeManifest(B18_R1_NONE)

[binji, 2012/10/16 23:09:10]

remove, self.manifest is defined below

+    archive = manifest_util.Archive(manifest_util.GetHostOS())
+    archive.url = 'file://%s' % os.path.abspath(self.test_file)
+    bundle = MakeBundle(18)
+    bundle.AddArchive(archive)
+    self.manifest = MakeManifest(bundle)
+    archive = self.manifest.GetBundles()[0]['archives'][0]
+
+    self.assertTrue('size' not in archive)
+    self.assertTrue('checksum' not in archive)
+
+    self.manifest.Validate()
+
+    self.assertEqual(archive['size'], 15)
+    self.assertEqual(archive['checksum']['sha1'], self.sha1)
 
-  return int(not result.wasSuccessful())
 
 if __name__ == '__main__':
-  sys.exit(main())
+  unittest.main()