Index: native_client_sdk/src/build_tools/tests/test_update_manifest.py |
diff --git a/native_client_sdk/src/build_tools/tests/test_update_manifest.py b/native_client_sdk/src/build_tools/tests/test_update_manifest.py |
index 600e63e4fdba98ab8f5a0c1a0537f3b7bf40754a..9feac9bf694664f4a9b694356cbdff99f14feccf 100755 |
--- a/native_client_sdk/src/build_tools/tests/test_update_manifest.py |
+++ b/native_client_sdk/src/build_tools/tests/test_update_manifest.py |
@@ -324,15 +324,15 @@ class TestUpdateManifest(unittest.TestCase): |
def testUpdateTwoBundles(self): |
self.manifest = MakeManifest(B18_R1_NONE, B19_R1_NONE) |
- self.history.Add(OS_MLW, BETA, V19_0_1084_41) |
- self.history.Add(OS_MLW, STABLE, V18_0_1025_163) |
+ self.history.Add(OS_MLW, DEV, V19_0_1084_41) |
+ self.history.Add(OS_MLW, BETA, V18_0_1025_163) |
self.files.Add(B18_0_1025_163_R1_MLW) |
self.files.Add(B19_0_1084_41_R1_MLW) |
self._MakeDelegate() |
self._Run(OS_MLW) |
self._ReadUploadedManifest() |
- self._AssertUploadedManifestHasBundle(B18_0_1025_163_R1_MLW, STABLE) |
- self._AssertUploadedManifestHasBundle(B19_0_1084_41_R1_MLW, BETA) |
+ self._AssertUploadedManifestHasBundle(B18_0_1025_163_R1_MLW, BETA) |
+ self._AssertUploadedManifestHasBundle(B19_0_1084_41_R1_MLW, DEV) |
self.assertEqual(len(self.uploaded_manifest.GetBundles()), 2) |
def testUpdateWithMissingPlatformsInArchives(self): |
@@ -359,20 +359,22 @@ class TestUpdateManifest(unittest.TestCase): |
self._AssertUploadedManifestHasBundle(B18_0_1025_163_R1_MLW, BETA) |
self.assertEqual(len(self.uploaded_manifest.GetBundles()), 1) |
- def testRecommendedIsMaintained(self): |
- for recommended in 'yes', 'no': |
+ def testRecommendedIsStable(self): |
+ for channel in STABLE, BETA, DEV, CANARY: |
self.setUp() |
bundle = copy.deepcopy(B18_R1_NONE) |
- bundle.recommended = recommended |
self.manifest = MakeManifest(bundle) |
- self.history.Add(OS_MLW, BETA, V18_0_1025_163) |
+ self.history.Add(OS_MLW, channel, V18_0_1025_163) |
self.files.Add(B18_0_1025_163_R1_MLW) |
self._MakeDelegate() |
self._Run(OS_MLW) |
self._ReadUploadedManifest() |
self.assertEqual(len(self.uploaded_manifest.GetBundles()), 1) |
uploaded_bundle = self.uploaded_manifest.GetBundle('pepper_18') |
- self.assertEqual(uploaded_bundle.recommended, recommended) |
+ if channel == STABLE: |
+ self.assertEqual(uploaded_bundle.recommended, 'yes') |
+ else: |
+ self.assertEqual(uploaded_bundle.recommended, 'no') |
def testNoUpdateWithNonPepperBundle(self): |
self.manifest = MakeManifest(NON_PEPPER_BUNDLE_NOARCHIVES, |