diff options
| author | mball@google.com <mball@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-07 14:33:10 +0000 |
|---|---|---|
| committer | mball@google.com <mball@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-07 14:33:10 +0000 |
| commit | 6a990577df076ff410e6e56210986a85f7dd890e (patch) | |
| tree | beb5a1833ae082ee5d09fe33e1a0bbfbc61d3a06 /native_client_sdk | |
| parent | bd0df509fc11e3ec1603b9a18305d068162b6e51 (diff) | |
| download | chromium_src-6a990577df076ff410e6e56210986a85f7dd890e.zip chromium_src-6a990577df076ff410e6e56210986a85f7dd890e.tar.gz chromium_src-6a990577df076ff410e6e56210986a85f7dd890e.tar.bz2 | |
Fixed failing sdk_update_test on NaCl SDK bots
BUG=None
TEST=None
TBR=bradnelson, noelallen
Review URL: http://codereview.chromium.org/8827008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113390 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'native_client_sdk')
| -rwxr-xr-x | native_client_sdk/src/build_tools/tests/sdk_update_test.py | 14 |
1 files changed, 6 insertions, 8 deletions
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 958923b..692243c 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:'), 6) + self.assertEqual(bundle_list.count('description:'), 7) 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(3, len(bundles)) + self.assertEqual(4, len(bundles)) local_manifest = sdk_update.SDKManifestFile( os.path.join(self._options.user_data_dir, sdk_update.MANIFEST_FILENAME)) @@ -123,9 +123,7 @@ class TestSDKUpdate(unittest.TestCase): for bundle in bundles: bundle_name = bundle['name'] self.assertTrue('revision' in bundle) - if bundle_name == 'test_1': - self.assertTrue(local_manifest.BundleNeedsUpdate(bundle)) - elif bundle_name == 'test_2': + if bundle_name in ['test_1', 'test_2', 'pepper_1']: self.assertTrue(local_manifest.BundleNeedsUpdate(bundle)) else: self.assertFalse(local_manifest.BundleNeedsUpdate(bundle)) @@ -135,7 +133,7 @@ class TestSDKUpdate(unittest.TestCase): tools = sdk_update.ManifestTools(self._options) tools.LoadManifest() bundles = tools.GetBundles() - self.assertEqual(3, len(bundles)) + self.assertEqual(4, len(bundles)) local_manifest = sdk_update.SDKManifestFile( os.path.join(self._options.user_data_dir, sdk_update.MANIFEST_FILENAME)) @@ -151,7 +149,7 @@ class TestSDKUpdate(unittest.TestCase): tools = sdk_update.ManifestTools(self._options) tools.LoadManifest() bundles = tools.GetBundles() - self.assertEqual(3, len(bundles)) + self.assertEqual(4, len(bundles)) local_manifest = sdk_update.SDKManifestFile( os.path.join(self._options.user_data_dir, sdk_update.MANIFEST_FILENAME)) @@ -159,7 +157,7 @@ class TestSDKUpdate(unittest.TestCase): # Test the | operator. for bundle in bundles: bundle_name = bundle['name'] - if bundle_name == 'test_2': + if bundle_name in ['pepper_1', 'test_2']: continue local_test_bundle = local_manifest.GetBundleNamed(bundle_name) merged_bundle = local_test_bundle.MergeWithBundle(bundle) |