Fix test that broke in earlier CL.

BUG=none
TEST=run_all_tests

Review URL: http://codereview.chromium.org/8893007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113839 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 43 insertions, 9 deletions

diff --git a/native_client_sdk/src/build_tools/tests/naclsdk_manifest_test.json b/native_client_sdk/src/build_tools/tests/naclsdk_manifest_test.json
index 9bf2567..f3dc797 100644
--- a/native_client_sdk/src/build_tools/tests/naclsdk_manifest_test.json
+++ b/native_client_sdk/src/build_tools/tests/naclsdk_manifest_test.json
@@ -109,7 +109,7 @@
       "version": 1,
       "archives": [
         {
-          "url": "file:///usr/local/google/users/mball/wrk/chromium/src/native_client_sdk/src/build_tools/tests/pepper_1_0/naclsdk_mac.tgz",
+          "url": "file:///Users/dspringer/Source/chromium/src/native_client_sdk/src/build_tools/tests/pepper_1_0/naclsdk_mac.tgz",
           "checksum": {
             "sha1": "db66a0bba015f481995648ed022fcd78c9da0539"
           },
@@ -117,7 +117,7 @@
           "size": 133
         },
         {
-          "url": "file:///usr/local/google/users/mball/wrk/chromium/src/native_client_sdk/src/build_tools/tests/pepper_1_0/naclsdk_linux.tgz",
+          "url": "file:///Users/dspringer/Source/chromium/src/native_client_sdk/src/build_tools/tests/pepper_1_0/naclsdk_linux.tgz",
           "checksum": {
             "sha1": "7137917e08e8403e8a92354e69d5ff649a022c39"
           },
@@ -125,7 +125,7 @@
           "size": 138
         },
         {
-          "url": "file:///usr/local/google/users/mball/wrk/chromium/src/native_client_sdk/src/build_tools/tests/pepper_1_0/naclsdk_win.exe",
+          "url": "file:///Users/dspringer/Source/chromium/src/native_client_sdk/src/build_tools/tests/pepper_1_0/naclsdk_win.exe",
           "checksum": {
             "sha1": "fd5cecf2c5cb990829fe42a14fb8e1efbb35bf8f"
           },
@@ -135,6 +135,40 @@
       ],
       "revision": 0,
       "name": "pepper_1"
+    },
+    {
+      "name": "pepper_phony",
+      "description": "Chrome -1 bundle, revision -1",
+      "stability": "dev",
+      "recommended": "no",
+      "version": -1,
+      "archives": [
+        {
+          "url": "file:///Users/dspringer/Source/chromium/src/native_client_sdk/src/build_tools/tests/pepper_1_0/naclsdk_mac.tgz",
+          "checksum": {
+            "sha1": "db66a0bba015f481995648ed022fcd78c9da0539"
+          },
+          "host_os": "mac",
+          "size": 133
+        },
+        {
+          "url": "file:///Users/dspringer/Source/chromium/src/native_client_sdk/src/build_tools/tests/pepper_1_0/naclsdk_linux.tgz",
+          "checksum": {
+            "sha1": "7137917e08e8403e8a92354e69d5ff649a022c39"
+          },
+          "host_os": "linux",
+          "size": 138
+        },
+        {
+          "url": "file:///Users/dspringer/Source/chromium/src/native_client_sdk/src/build_tools/tests/pepper_1_0/naclsdk_win.exe",
+          "checksum": {
+            "sha1": "fd5cecf2c5cb990829fe42a14fb8e1efbb35bf8f"
+          },
+          "host_os": "win",
+          "size": 138
+        }
+      ],
+      "revision": -1
     }
   ],
   "manifest_version": 1
diff --git a/native_client_sdk/src/build_tools/tests/sdk_update_test.py b/native_client_sdk/src/build_tools/tests/sdk_update_test.py
index 692243c..3b46f1b 100755
--- a/native_client_sdk/src/build_tools/tests/sdk_update_test.py
+++ b/native_client_sdk/src/build_tools/tests/sdk_update_test.py
@@ -84,7 +84,7 @@ class TestSDKUpdate(unittest.TestCase):
     self.assertEqual(bundle_list.count('sdk_tools'), 2)
     self.assertEqual(bundle_list.count('test_1'), 2)
     self.assertEqual(bundle_list.count('test_2'), 1)
-    self.assertEqual(bundle_list.count('description:'), 7)
+    self.assertEqual(bundle_list.count('description:'), 8)
 
   def testUpdateHelp(self):
     '''Test the help for the update command'''
@@ -115,7 +115,7 @@ class TestSDKUpdate(unittest.TestCase):
     tools = sdk_update.ManifestTools(self._options)
     tools.LoadManifest()
     bundles = tools.GetBundles()
-    self.assertEqual(4, len(bundles))
+    self.assertEqual(5, len(bundles))
     local_manifest = sdk_update.SDKManifestFile(
         os.path.join(self._options.user_data_dir,
                      sdk_update.MANIFEST_FILENAME))
@@ -123,7 +123,7 @@ class TestSDKUpdate(unittest.TestCase):
     for bundle in bundles:
       bundle_name = bundle['name']
       self.assertTrue('revision' in bundle)
-      if bundle_name in ['test_1', 'test_2', 'pepper_1']:
+      if bundle_name in ['test_1', 'test_2', 'pepper_1', 'pepper_phony']:
         self.assertTrue(local_manifest.BundleNeedsUpdate(bundle))
       else:
         self.assertFalse(local_manifest.BundleNeedsUpdate(bundle))
@@ -133,7 +133,7 @@ class TestSDKUpdate(unittest.TestCase):
     tools = sdk_update.ManifestTools(self._options)
     tools.LoadManifest()
     bundles = tools.GetBundles()
-    self.assertEqual(4, len(bundles))
+    self.assertEqual(5, len(bundles))
     local_manifest = sdk_update.SDKManifestFile(
         os.path.join(self._options.user_data_dir,
                      sdk_update.MANIFEST_FILENAME))
@@ -149,7 +149,7 @@ class TestSDKUpdate(unittest.TestCase):
     tools = sdk_update.ManifestTools(self._options)
     tools.LoadManifest()
     bundles = tools.GetBundles()
-    self.assertEqual(4, len(bundles))
+    self.assertEqual(5, len(bundles))
     local_manifest = sdk_update.SDKManifestFile(
         os.path.join(self._options.user_data_dir,
                      sdk_update.MANIFEST_FILENAME))
@@ -157,7 +157,7 @@ class TestSDKUpdate(unittest.TestCase):
     # Test the | operator.
     for bundle in bundles:
       bundle_name = bundle['name']
-      if bundle_name in ['pepper_1', 'test_2']:
+      if bundle_name in ['pepper_1', 'test_2', 'pepper_phony']:
         continue
       local_test_bundle = local_manifest.GetBundleNamed(bundle_name)
       merged_bundle = local_test_bundle.MergeWithBundle(bundle)