| OLD | NEW |
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
| 2 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 2 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be |
| 4 # found in the LICENSE file. | 4 # found in the LICENSE file. |
| 5 | 5 |
| 6 import copy | 6 import copy |
| 7 import datetime | 7 import datetime |
| 8 import os | 8 import os |
| 9 import posixpath | 9 import posixpath |
| 10 import subprocess | 10 import subprocess |
| (...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 317 self.files.Add(B18_0_1025_163_R1_MLW) | 317 self.files.Add(B18_0_1025_163_R1_MLW) |
| 318 self._MakeDelegate() | 318 self._MakeDelegate() |
| 319 self._Run(OS_MLW) | 319 self._Run(OS_MLW) |
| 320 self._ReadUploadedManifest() | 320 self._ReadUploadedManifest() |
| 321 self._AssertUploadedManifestHasBundle(B18_0_1025_163_R1_MLW, BETA) | 321 self._AssertUploadedManifestHasBundle(B18_0_1025_163_R1_MLW, BETA) |
| 322 self._AssertUploadedManifestHasBundle(B19_0_1084_41_R1_MLW, DEV) | 322 self._AssertUploadedManifestHasBundle(B19_0_1084_41_R1_MLW, DEV) |
| 323 self.assertEqual(len(self.uploaded_manifest.GetBundles()), 2) | 323 self.assertEqual(len(self.uploaded_manifest.GetBundles()), 2) |
| 324 | 324 |
| 325 def testUpdateTwoBundles(self): | 325 def testUpdateTwoBundles(self): |
| 326 self.manifest = MakeManifest(B18_R1_NONE, B19_R1_NONE) | 326 self.manifest = MakeManifest(B18_R1_NONE, B19_R1_NONE) |
| 327 self.history.Add(OS_MLW, BETA, V19_0_1084_41) | 327 self.history.Add(OS_MLW, DEV, V19_0_1084_41) |
| 328 self.history.Add(OS_MLW, STABLE, V18_0_1025_163) | 328 self.history.Add(OS_MLW, BETA, V18_0_1025_163) |
| 329 self.files.Add(B18_0_1025_163_R1_MLW) | 329 self.files.Add(B18_0_1025_163_R1_MLW) |
| 330 self.files.Add(B19_0_1084_41_R1_MLW) | 330 self.files.Add(B19_0_1084_41_R1_MLW) |
| 331 self._MakeDelegate() | 331 self._MakeDelegate() |
| 332 self._Run(OS_MLW) | 332 self._Run(OS_MLW) |
| 333 self._ReadUploadedManifest() | 333 self._ReadUploadedManifest() |
| 334 self._AssertUploadedManifestHasBundle(B18_0_1025_163_R1_MLW, STABLE) | 334 self._AssertUploadedManifestHasBundle(B18_0_1025_163_R1_MLW, BETA) |
| 335 self._AssertUploadedManifestHasBundle(B19_0_1084_41_R1_MLW, BETA) | 335 self._AssertUploadedManifestHasBundle(B19_0_1084_41_R1_MLW, DEV) |
| 336 self.assertEqual(len(self.uploaded_manifest.GetBundles()), 2) | 336 self.assertEqual(len(self.uploaded_manifest.GetBundles()), 2) |
| 337 | 337 |
| 338 def testUpdateWithMissingPlatformsInArchives(self): | 338 def testUpdateWithMissingPlatformsInArchives(self): |
| 339 self.manifest = MakeManifest(B18_R1_NONE) | 339 self.manifest = MakeManifest(B18_R1_NONE) |
| 340 self.history.Add(OS_MLW, BETA, V18_0_1025_184) | 340 self.history.Add(OS_MLW, BETA, V18_0_1025_184) |
| 341 self.history.Add(OS_MLW, BETA, V18_0_1025_163) | 341 self.history.Add(OS_MLW, BETA, V18_0_1025_163) |
| 342 self.files.Add(B18_0_1025_184_R1_MLW, add_archive_for_os=OS_M) | 342 self.files.Add(B18_0_1025_184_R1_MLW, add_archive_for_os=OS_M) |
| 343 self.files.Add(B18_0_1025_163_R1_MLW) | 343 self.files.Add(B18_0_1025_163_R1_MLW) |
| 344 self._MakeDelegate() | 344 self._MakeDelegate() |
| 345 self._Run(OS_MLW) | 345 self._Run(OS_MLW) |
| 346 self._ReadUploadedManifest() | 346 self._ReadUploadedManifest() |
| 347 self._AssertUploadedManifestHasBundle(B18_0_1025_163_R1_MLW, BETA) | 347 self._AssertUploadedManifestHasBundle(B18_0_1025_163_R1_MLW, BETA) |
| 348 self.assertEqual(len(self.uploaded_manifest.GetBundles()), 1) | 348 self.assertEqual(len(self.uploaded_manifest.GetBundles()), 1) |
| 349 | 349 |
| 350 def testUpdateWithMissingManifestSnippets(self): | 350 def testUpdateWithMissingManifestSnippets(self): |
| 351 self.manifest = MakeManifest(B18_R1_NONE) | 351 self.manifest = MakeManifest(B18_R1_NONE) |
| 352 self.history.Add(OS_MLW, BETA, V18_0_1025_184) | 352 self.history.Add(OS_MLW, BETA, V18_0_1025_184) |
| 353 self.history.Add(OS_MLW, BETA, V18_0_1025_163) | 353 self.history.Add(OS_MLW, BETA, V18_0_1025_163) |
| 354 self.files.Add(B18_0_1025_184_R1_MLW, add_json_for_os=OS_ML) | 354 self.files.Add(B18_0_1025_184_R1_MLW, add_json_for_os=OS_ML) |
| 355 self.files.Add(B18_0_1025_163_R1_MLW) | 355 self.files.Add(B18_0_1025_163_R1_MLW) |
| 356 self._MakeDelegate() | 356 self._MakeDelegate() |
| 357 self._Run(OS_MLW) | 357 self._Run(OS_MLW) |
| 358 self._ReadUploadedManifest() | 358 self._ReadUploadedManifest() |
| 359 self._AssertUploadedManifestHasBundle(B18_0_1025_163_R1_MLW, BETA) | 359 self._AssertUploadedManifestHasBundle(B18_0_1025_163_R1_MLW, BETA) |
| 360 self.assertEqual(len(self.uploaded_manifest.GetBundles()), 1) | 360 self.assertEqual(len(self.uploaded_manifest.GetBundles()), 1) |
| 361 | 361 |
| 362 def testRecommendedIsMaintained(self): | 362 def testRecommendedIsStable(self): |
| 363 for recommended in 'yes', 'no': | 363 for channel in STABLE, BETA, DEV, CANARY: |
| 364 self.setUp() | 364 self.setUp() |
| 365 bundle = copy.deepcopy(B18_R1_NONE) | 365 bundle = copy.deepcopy(B18_R1_NONE) |
| 366 bundle.recommended = recommended | |
| 367 self.manifest = MakeManifest(bundle) | 366 self.manifest = MakeManifest(bundle) |
| 368 self.history.Add(OS_MLW, BETA, V18_0_1025_163) | 367 self.history.Add(OS_MLW, channel, V18_0_1025_163) |
| 369 self.files.Add(B18_0_1025_163_R1_MLW) | 368 self.files.Add(B18_0_1025_163_R1_MLW) |
| 370 self._MakeDelegate() | 369 self._MakeDelegate() |
| 371 self._Run(OS_MLW) | 370 self._Run(OS_MLW) |
| 372 self._ReadUploadedManifest() | 371 self._ReadUploadedManifest() |
| 373 self.assertEqual(len(self.uploaded_manifest.GetBundles()), 1) | 372 self.assertEqual(len(self.uploaded_manifest.GetBundles()), 1) |
| 374 uploaded_bundle = self.uploaded_manifest.GetBundle('pepper_18') | 373 uploaded_bundle = self.uploaded_manifest.GetBundle('pepper_18') |
| 375 self.assertEqual(uploaded_bundle.recommended, recommended) | 374 if channel == STABLE: |
| 375 self.assertEqual(uploaded_bundle.recommended, 'yes') |
| 376 else: |
| 377 self.assertEqual(uploaded_bundle.recommended, 'no') |
| 376 | 378 |
| 377 def testNoUpdateWithNonPepperBundle(self): | 379 def testNoUpdateWithNonPepperBundle(self): |
| 378 self.manifest = MakeManifest(NON_PEPPER_BUNDLE_NOARCHIVES, | 380 self.manifest = MakeManifest(NON_PEPPER_BUNDLE_NOARCHIVES, |
| 379 B18_0_1025_163_R1_MLW) | 381 B18_0_1025_163_R1_MLW) |
| 380 self._MakeDelegate() | 382 self._MakeDelegate() |
| 381 self._Run(OS_MLW) | 383 self._Run(OS_MLW) |
| 382 self.assertEqual(self._HasUploadedManifest(), False) | 384 self.assertEqual(self._HasUploadedManifest(), False) |
| 383 | 385 |
| 384 def testUpdateWithHistoryWithExtraneousPlatforms(self): | 386 def testUpdateWithHistoryWithExtraneousPlatforms(self): |
| 385 self.manifest = MakeManifest(B18_R1_NONE) | 387 self.manifest = MakeManifest(B18_R1_NONE) |
| (...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 497 self._AssertUploadedManifestHasBundle(my_bundle, CANARY) | 499 self._AssertUploadedManifestHasBundle(my_bundle, CANARY) |
| 498 | 500 |
| 499 def main(): | 501 def main(): |
| 500 suite = unittest.defaultTestLoader.loadTestsFromModule(sys.modules[__name__]) | 502 suite = unittest.defaultTestLoader.loadTestsFromModule(sys.modules[__name__]) |
| 501 result = unittest.TextTestRunner(verbosity=2).run(suite) | 503 result = unittest.TextTestRunner(verbosity=2).run(suite) |
| 502 | 504 |
| 503 return int(not result.wasSuccessful()) | 505 return int(not result.wasSuccessful()) |
| 504 | 506 |
| 505 if __name__ == '__main__': | 507 if __name__ == '__main__': |
| 506 sys.exit(main()) | 508 sys.exit(main()) |
| OLD | NEW |