OLD | NEW |
1 # Copyright 2015 The Chromium Authors. All rights reserved. | 1 # Copyright 2015 The Chromium Authors. All rights reserved. |
2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
4 | 4 |
5 import collections | 5 import collections |
6 import copy | 6 import copy |
7 import logging | 7 import logging |
8 import os | 8 import os |
9 import pickle | 9 import pickle |
10 import re | 10 import re |
(...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
386 self._driver_package = None | 386 self._driver_package = None |
387 self._driver_name = None | 387 self._driver_name = None |
388 self._initializeDriverAttributes() | 388 self._initializeDriverAttributes() |
389 | 389 |
390 self._timeout_scale = None | 390 self._timeout_scale = None |
391 self._initializeTestControlAttributes(args) | 391 self._initializeTestControlAttributes(args) |
392 | 392 |
393 self._coverage_directory = None | 393 self._coverage_directory = None |
394 self._initializeTestCoverageAttributes(args) | 394 self._initializeTestCoverageAttributes(args) |
395 | 395 |
396 self._store_tombstones = False | |
397 self._initializeTombstonesAttributes(args) | |
398 | |
399 def _initializeApkAttributes(self, args, error_func): | 396 def _initializeApkAttributes(self, args, error_func): |
400 if args.apk_under_test: | 397 if args.apk_under_test: |
401 apk_under_test_path = args.apk_under_test | 398 apk_under_test_path = args.apk_under_test |
402 if not args.apk_under_test.endswith('.apk'): | 399 if not args.apk_under_test.endswith('.apk'): |
403 apk_under_test_path = os.path.join( | 400 apk_under_test_path = os.path.join( |
404 constants.GetOutDirectory(), constants.SDK_BUILD_APKS_DIR, | 401 constants.GetOutDirectory(), constants.SDK_BUILD_APKS_DIR, |
405 '%s.apk' % args.apk_under_test) | 402 '%s.apk' % args.apk_under_test) |
406 | 403 |
407 if not os.path.exists(apk_under_test_path): | 404 if not os.path.exists(apk_under_test_path): |
408 error_func('Unable to find APK under test: %s' % apk_under_test_path) | 405 error_func('Unable to find APK under test: %s' % apk_under_test_path) |
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
531 else: | 528 else: |
532 self._driver_apk = None | 529 self._driver_apk = None |
533 | 530 |
534 def _initializeTestControlAttributes(self, args): | 531 def _initializeTestControlAttributes(self, args): |
535 self._screenshot_dir = args.screenshot_dir | 532 self._screenshot_dir = args.screenshot_dir |
536 self._timeout_scale = args.timeout_scale or 1 | 533 self._timeout_scale = args.timeout_scale or 1 |
537 | 534 |
538 def _initializeTestCoverageAttributes(self, args): | 535 def _initializeTestCoverageAttributes(self, args): |
539 self._coverage_directory = args.coverage_dir | 536 self._coverage_directory = args.coverage_dir |
540 | 537 |
541 def _initializeTombstonesAttributes(self, args): | |
542 self._store_tombstones = args.store_tombstones | |
543 | |
544 @property | 538 @property |
545 def additional_apks(self): | 539 def additional_apks(self): |
546 return self._additional_apks | 540 return self._additional_apks |
547 | 541 |
548 @property | 542 @property |
549 def apk_under_test(self): | 543 def apk_under_test(self): |
550 return self._apk_under_test | 544 return self._apk_under_test |
551 | 545 |
552 @property | 546 @property |
553 def apk_under_test_incremental_install_script(self): | 547 def apk_under_test_incremental_install_script(self): |
(...skipping 21 matching lines...) Expand all Loading... |
575 | 569 |
576 @property | 570 @property |
577 def package_info(self): | 571 def package_info(self): |
578 return self._package_info | 572 return self._package_info |
579 | 573 |
580 @property | 574 @property |
581 def screenshot_dir(self): | 575 def screenshot_dir(self): |
582 return self._screenshot_dir | 576 return self._screenshot_dir |
583 | 577 |
584 @property | 578 @property |
585 def store_tombstones(self): | |
586 return self._store_tombstones | |
587 | |
588 @property | |
589 def suite(self): | 579 def suite(self): |
590 return self._suite | 580 return self._suite |
591 | 581 |
592 @property | 582 @property |
593 def test_apk(self): | 583 def test_apk(self): |
594 return self._test_apk | 584 return self._test_apk |
595 | 585 |
596 @property | 586 @property |
597 def test_apk_incremental_install_script(self): | 587 def test_apk_incremental_install_script(self): |
598 return self._test_apk_incremental_install_script | 588 return self._test_apk_incremental_install_script |
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
688 @staticmethod | 678 @staticmethod |
689 def GenerateTestResults( | 679 def GenerateTestResults( |
690 result_code, result_bundle, statuses, start_ms, duration_ms): | 680 result_code, result_bundle, statuses, start_ms, duration_ms): |
691 return GenerateTestResults(result_code, result_bundle, statuses, | 681 return GenerateTestResults(result_code, result_bundle, statuses, |
692 start_ms, duration_ms) | 682 start_ms, duration_ms) |
693 | 683 |
694 #override | 684 #override |
695 def TearDown(self): | 685 def TearDown(self): |
696 if self._isolate_delegate: | 686 if self._isolate_delegate: |
697 self._isolate_delegate.Clear() | 687 self._isolate_delegate.Clear() |
OLD | NEW |