diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-08-23 09:20:48 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-08-23 09:20:48 +0000 |
| commit | c049e71733937a61f744ebb8a703687b238ada23 (patch) | |
| tree | fcd70f2153f011e803c79d4eb918a2f6a52679b5 | |
| parent | 36257e9963cae103badad7d7fc5163bbd81ed50f (diff) | |
| parent | 350783b41b06ade08cfb0754162d6177a11814e6 (diff) | |
| download | connectivity-c049e71733937a61f744ebb8a703687b238ada23.tar.gz | |
Snap for 8981239 from 350783b41b06ade08cfb0754162d6177a11814e6 to mainline-tzdata4-releaseaml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000android13-mainline-tzdata4-releaseaml_tz4_332714010
Change-Id: I207e784480385d8b080cd9422668ec2cb336347a
| -rwxr-xr-x | acts/framework/acts/base_test.py | 4 | ||||
| -rwxr-xr-x | acts/framework/setup.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/acts/framework/acts/base_test.py b/acts/framework/acts/base_test.py index 8428fb43d..6bf9424ae 100755 --- a/acts/framework/acts/base_test.py +++ b/acts/framework/acts/base_test.py @@ -638,7 +638,7 @@ class BaseTestClass(MoblyBaseTest): tag="", name_func=None, format_args=False): - """Deprecated. Please use setup_generated_tests and generate_tests. + """Deprecated. Please use pre_run and generate_tests. Generated test cases are not written down as functions, but as a list of parameter sets. This way we reduce code repetition and improve @@ -766,7 +766,7 @@ class BaseTestClass(MoblyBaseTest): The test results object of this class. """ # Executes pre-setup procedures, like generating test methods. - if not self._setup_generated_tests(): + if not self._pre_run(): return self.results self.register_test_class_event_subscriptions() diff --git a/acts/framework/setup.py b/acts/framework/setup.py index 21168fd05..26d59f698 100755 --- a/acts/framework/setup.py +++ b/acts/framework/setup.py @@ -28,7 +28,7 @@ install_requires = [ # Future needs to have a newer version that contains urllib. 'future>=0.16.0', 'grpcio', - 'mobly>=1.10.0', + 'mobly==1.12.0', # Latest version of mock (4.0.0b) causes a number of compatibility issues with ACTS unit tests # b/148695846, b/148814743 'mock==3.0.5', |