Android-x86
Fork
Faire un don

  • R/O
  • HTTP
  • SSH
  • HTTPS

hardware-interfaces: Commit

hardware/interfaces


Commit MetaInfo

Révision15e945976b2d8a7047c2a8b87fd639c97423cf51 (tree)
l'heure2017-10-16 19:19:26
AuteurErik Kline <ek@goog...>
CommiterErik Kline

Message de Log

tetheroffload VTS: fix stopOffload test conditions

The tetheroffload HAL is somewhat...and over- and under-specified.
A not unreasonable interpretation is that stopOffload() doesn't have
return success unless offload was actually started (via a call to
setUpstreamParameters()), and that after initOffload() and before
setUpstreamParameters() not actual "offload" has been engaged.

Precision in this matter is not required for the test case:

OffloadControlHidlTestBase.AdditionalInitsWithoutStopReturnFalse

But for the test case:

OffloadControlHidlTestBase.AdditionalStopsWithInitReturnFalse

we want to ensure the "matching" stopOffload call succeeds. For this
test we add in a call to setUpstreamParameters() for good measure.

Test: as follows

prompt$ make vts -j30 BUILD_GOOGLE_VTS=true && \
vts-tradefed run commandAndExit vts \
--skip-all-system-status-check \
--primary-abi-only \
--skip-preconditions \
--module VtsHalTetherOffloadControlV1_0Target \
-l DEBUG

Observed:

10-16 19:17:17 I/ResultReporter: Invocation finished in 1m 2s. PASSED: 38, FAILED: 0, MODULES: 1 of 1

Bug: 65270149
Bug: 65612227
Bug: 65612332
Change-Id: I924d41f5a20f07707e3d6991cb59d9c6b2b02339

Change Summary

Modification

--- a/tetheroffload/control/1.0/vts/functional/VtsHalTetheroffloadControlV1_0TargetTest.cpp
+++ b/tetheroffload/control/1.0/vts/functional/VtsHalTetheroffloadControlV1_0TargetTest.cpp
@@ -231,7 +231,6 @@ TEST_F(OffloadControlHidlTestBase, AdditionalInitsWithoutStopReturnFalse) {
231231 initOffload(false);
232232 initOffload(false);
233233 initOffload(false);
234- stopOffload(ExpectBoolean::True); // balance out initOffload(true)
235234 }
236235
237236 // Check that calling stopOffload() without first having called initOffload() returns false.
@@ -244,6 +243,14 @@ TEST_F(OffloadControlHidlTestBase, MultipleStopsWithoutInitReturnFalse) {
244243 // Check that calling stopOffload() after a complete init/stop cycle returns false.
245244 TEST_F(OffloadControlHidlTestBase, AdditionalStopsWithInitReturnFalse) {
246245 initOffload(true);
246+ // Call setUpstreamParameters() so that "offload" can be reasonably said
247+ // to be both requested and operational.
248+ const hidl_string v4Addr("192.0.0.2");
249+ const hidl_string v4Gw("192.0.0.1");
250+ const vector<hidl_string> v6Gws{hidl_string("fe80::db8:1"), hidl_string("fe80::db8:2")};
251+ const Return<void> upstream =
252+ control->setUpstreamParameters("rmnet_data0", v4Addr, v4Gw, v6Gws, ASSERT_TRUE_CALLBACK);
253+ EXPECT_TRUE(upstream.isOk());
247254 stopOffload(ExpectBoolean::True); // balance out initOffload(true)
248255 stopOffload(ExpectBoolean::False);
249256 stopOffload(ExpectBoolean::False);
Afficher sur ancien navigateur de dépôt.