Snap for 8972261 from 350783b41b06ade08cfb0754162d6177a11814e6 to mainline-media-swcodec-release
Change-Id: Ie096b1d6219e0ddfd92e8fd5b0706a3c874af389
diff --git a/acts/framework/acts/base_test.py b/acts/framework/acts/base_test.py
index 8428fb4..6bf9424 100755
--- a/acts/framework/acts/base_test.py
+++ b/acts/framework/acts/base_test.py
@@ -638,7 +638,7 @@
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 @@
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 21168fd..26d59f6 100755
--- a/acts/framework/setup.py
+++ b/acts/framework/setup.py
@@ -28,7 +28,7 @@
# 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',
