diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-05-07 18:43:04 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-07 18:43:04 +0000 |
| commit | 4c544f0311100f13fe846d00be40e37e1ae04cc3 (patch) | |
| tree | a3f60ee24ce4549fd508155c03e6b368243bb919 | |
| parent | 9baca7c4db4d8c695e144ea4a78d5d3915d7703a (diff) | |
| parent | e965fa27f247ef8ac7e0e9357d39abe802ebae80 (diff) | |
| download | platform_tools_test_connectivity-4c544f0311100f13fe846d00be40e37e1ae04cc3.tar.gz platform_tools_test_connectivity-4c544f0311100f13fe846d00be40e37e1ae04cc3.tar.bz2 platform_tools_test_connectivity-4c544f0311100f13fe846d00be40e37e1ae04cc3.zip | |
Snap for 6469672 from 0a493da720e04233a99a5abe55ff1e563b572a9b to rvc-release am: e965fa27f2
Change-Id: Ia3711d96f45c20e1df2c066e5cca05752f0eddfc
| -rw-r--r-- | acts/tests/google/wifi/WifiNetworkSuggestionTest.py | 1 | ||||
| -rw-r--r-- | acts/tests/google/wifi/aware/functional/NonConcurrencyTest.py | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/acts/tests/google/wifi/WifiNetworkSuggestionTest.py b/acts/tests/google/wifi/WifiNetworkSuggestionTest.py index 2321a71bbe..90994875e4 100644 --- a/acts/tests/google/wifi/WifiNetworkSuggestionTest.py +++ b/acts/tests/google/wifi/WifiNetworkSuggestionTest.py @@ -112,6 +112,7 @@ class WifiNetworkSuggestionTest(WifiBaseTest): def setup_test(self): self.dut.droid.wakeLockAcquireBright() self.dut.droid.wakeUpNow() + self.dut.unlock_screen() self.clear_user_disabled_networks() wutils.wifi_toggle_state(self.dut, True) self.dut.ed.clear_all_events() diff --git a/acts/tests/google/wifi/aware/functional/NonConcurrencyTest.py b/acts/tests/google/wifi/aware/functional/NonConcurrencyTest.py index 150068dca2..51f4caedd4 100644 --- a/acts/tests/google/wifi/aware/functional/NonConcurrencyTest.py +++ b/acts/tests/google/wifi/aware/functional/NonConcurrencyTest.py @@ -14,8 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -from acts import asserts import queue +import time + +from acts import asserts from acts import utils from acts.test_decorators import test_tracker_info from acts.test_utils.wifi import wifi_test_utils as wutils @@ -58,6 +60,8 @@ class NonConcurrencyTest(AwareBaseTest): id = dut.droid.wifiAwareAttach() autils.wait_for_event(dut, aconsts.EVENT_CB_ON_ATTACHED) + time.sleep(EVENT_TIMEOUT) + # start other service if is_p2p: dut.droid.wifiP2pInitialize() |