Commit graph android_packages_modules_Co.../tests/net/java/com/android
Message SHA1
Rename AvoidBadWifiTracker to MultinetworkPolicyTracker am: b8dfec4b88 am: a566163a38
am: 3cdc4f95e0

Change-Id: I91f1338f3488cfc60eef0c2147aa7b1d61107cdd

Lorenzo Colitti   authored and   android-build-merger   commited 2017-02-01 02:59:42 +00:00
1afd50b7b8
Attempt to make waitForIdleHandler reliable. am: 53347a0f27 am: 9f0ddc6573
am: dfd6d2e764

Change-Id: I2369fbd693b467283232f47703fd471c8ff60c1f

Lorenzo Colitti   authored and   android-build-merger   commited 2017-02-01 02:58:24 +00:00
3701103f7f
Rename AvoidBadWifiTracker to MultinetworkPolicyTracker
am: b8dfec4b88

Change-Id: I7615c9128deed7011eb9ab6f2efdcfe2e237a1a5

Lorenzo Colitti   authored and   android-build-merger   commited 2017-02-01 02:37:31 +00:00
a566163a38
Attempt to make waitForIdleHandler reliable.
am: 53347a0f27

Change-Id: Id7e23c3a2c885ff239efa577a8d366d3df6ca9a2

Lorenzo Colitti   authored and   android-build-merger   commited 2017-02-01 02:36:22 +00:00
9f0ddc6573
Rename AvoidBadWifiTracker to MultinetworkPolicyTracker
Rename the class and ensure that all code related to bad wifi
avoidance has names that reflect its purpose.  This will allow us
to reuse most of the the code for other purposes in future CLs.

Test: runtest frameworks-net passes
Bug: 34630278
Change-Id: Ida190e5a79e7a12f4eec07e1a3e4d9d138e83bcd

Lorenzo Colitti   commited 2017-01-31 15:42:57 +09:00
b8dfec4b88
Attempt to make waitForIdleHandler reliable.
The current implementation of IdleableHandlerThread is based on
the assumption that MessageQueue#isIdle will return true iff the
message loop has finished processing its messages.

Unfortunately, this is incorrect: isIdle returns true iff are no
more messages waiting in the queue; thus, it will also return
true while it is processing the last message before going idle.

Instead of using idle handlers, take the simpler approach of
posting a runnable to the message loop and waiting for it to
be processed.

Test: see other CLs in this patch series
Bug: 31479480
Change-Id: Iae75781f067b762c8653a488a5e4d5ee0c789e01

Lorenzo Colitti   commited 2017-01-31 15:42:17 +09:00
53347a0f27
Merge "ConnectivityServiceTest: fix flaky tests" am: b2c16c3a95 am: 550c813eb5
am: 17f86737ec

Change-Id: Iaa1ab50a323133cadfa4f39440fce982cde8d1fe

Lorenzo Colitti   authored and   android-build-merger   commited 2017-01-27 10:00:06 +00:00
cbbb8019b5
Merge "ConnectivityServiceTest: remove flaky waitForIdle test." am: be80577f5b am: 100dd57c82
am: d635e56751

Change-Id: I1d3707b4bc2ae00ca0fad1c3ec7e6ca859fcdd16

Lorenzo Colitti   authored and   android-build-merger   commited 2017-01-27 09:55:36 +00:00
5ba5fd6ee6
Merge "ConnectivityServiceTest: fix flaky tests"
am: b2c16c3a95

Change-Id: I0577f6b48de8a95e7d12e58a672fb0374ced9403

Lorenzo Colitti   authored and   android-build-merger   commited 2017-01-27 09:51:32 +00:00
550c813eb5
Merge "ConnectivityServiceTest: remove flaky waitForIdle test."
am: be80577f5b

Change-Id: I444746af6adc7be4a3f69243379f65aadf29ea19

Lorenzo Colitti   authored and   android-build-merger   commited 2017-01-27 09:47:05 +00:00
100dd57c82
Merge "ConnectivityServiceTest: fix flaky tests"
Lorenzo Colitti   authored and   Gerrit Code Review   commited 2017-01-27 09:40:47 +00:00
b2c16c3a95
frameworks-test: adding missing @SmallTest
This activates all frameworks-test tests in runs of the continuous
platform tests.

Test: $ runtest frameworks-net passes (expect Tether
Bug: 32561414
(cherry picked from commit 174b398594)

Change-Id: I7b0706a7e3368f971d508388e8ad4afc5de9d646

Hugo Benichi   authored and   Lorenzo Colitti   commited 2017-01-26 18:52:45 +09:00
3b37fe1b2a
Netd events: record connect() success/errno
Test: $ runtest frameworks-net pass
Bug: 32198976

(cherry picked from commit 8b06bcdfd24100302818ae0e11ee751dd813d5cf)

Change-Id: Ib3be06d2678c3fcfe4fa9d7b77f50c6e8812db3d

Hugo Benichi   authored and   Lorenzo Colitti   commited 2017-01-26 18:52:41 +09:00
8f37db38c1
Show notification for always-on app VPN
This is the same notification as the one shown during legacy lockdown
mode, sans the 'reset' button.

The notification is only shown during times when VPN has not yet
established or has failed, for example during boot or after a crash.

Bug: 29123115

(cherry picked from commit 81f2dff176)

Change-Id: I929a05c24df01e21415535a333bb14ac4b790a9d

Tony Mak   authored and   Lorenzo Colitti   commited 2017-01-26 18:52:35 +09:00
69ab53a3c1
ConnectivityServiceTest: fix testAvoidBadWifiSettings
This patch introduces an assertEventuallyThat helper function in
ConnectivityServiceTest which given a boolean function retries until the
function returns true or until a maximum retry time is reached.

This function is used to fix flakyness of testAvoidBadWifiSetting where
the Message posted by reevaluate() could reach the Handler's
MessageQueue after waitForIdle takes effect, resulting in the test to
fail.

Instead of fixing the flakyness by introdcing hard sleep times,
assertEventuallyThat is used to reduce the overall test time.

With this change the test has been observed to pass with 100% success
rate over 50000 invocations.

Test: $ runtest frameworks-net
Bug: 32561414

(cherry picked from commit ccf7f00258)

Change-Id: If41a24989d5f65aeb439f68741f511b5eb53b18d

Hugo Benichi   authored and   Lorenzo Colitti   commited 2017-01-26 18:52:18 +09:00
bbd9da86bf
Fix ConnectivityServiceTest testRequestBenchmark
This patch fixes flakyness of testRequestBenchmark by adjusting time
limit for callback registration from 100ms to 180ms, and time limits for
onAvailable and onLost triggers from 30ms to 40ms.

With these timeouts the test succeeds 100% over 5000 iterations.

When using 150ms for registration timeout, running the test 5000 times
fails 2 times.

When using 30ms for onLost timeout, running the test 5000 times fails
1 times.

In addition, this patch also cleans testRequestBenchmark and uses the
more stable SystemClock.elapsedRealtime() for duration measurements.

Test: $ runtest frameworks-net
Bug: 32561414

(cherry picked from commit cf7db79028)

Change-Id: I196ab9ef7f5abe456a783eed65db09279d2ecb8c

Hugo Benichi   authored and   Lorenzo Colitti   commited 2017-01-26 18:52:14 +09:00
34f4a95ebd
IpConnectivityMetrics reads buffer size in settings
Test: IpConnectivityMetricsTest passes. Also manually changed the new
setting and verified the buffer size is as expected after flushing the
buffer.
Bug: 32198637

(cherry picked from commit d5f78a08b4)

Change-Id: Iefbeac3a688b260fb3f92dfe0bfd9db28e26749d

Hugo Benichi   authored and   Lorenzo Colitti   commited 2017-01-26 18:51:30 +09:00
db884dbcf4
IpConnectivity metrics: add version number
This patch adds a version field to ipconnectivity.proto and populates it
to 2, which is the logical version number for NYC-MR2.

Test: IpConnectivity{EventBuilder,Metrics}Test pass
Bug: 32127906

(cherry picked from commit 79a739cbf3)

Change-Id: If8f167c0dc4c1abe0e235e2adfd131168a4ddc52

Hugo Benichi   authored and   Lorenzo Colitti   commited 2017-01-26 18:51:18 +09:00
812ad17d33
[CS] Remove timeout event after first available
Guarantees that timeouts are only delivered if a network never
becomes available. Once a network is available the timeout is
canceled.

Bug: 31402633
Test: all timeout related unit tests pass (new one added)

(cherry picked from commit 88087226a6)

Change-Id: I7cd3086544c881915fc6dbf14b87a24ab0cd8748

Etan Cohen   authored and   Lorenzo Colitti   commited 2017-01-26 18:51:15 +09:00
b6ae65fe6b
Move the connectivity tests to frameworks/base/tests/net.
This will give us a good place to put all the networking tests.

Fix: 31479480
Test: adb  shell am instrument -w -e notClass com.android.server.connectivity.tethering.TetherInterfaceStateMachineTest 'com.android.frameworks.tests.net/android.support.test.runner.AndroidJUnitRunner'  # PASS

(cherry picked from commit 384a9cb1f9)

Change-Id: I993eeaa5dec001c39389023f355f506129b356e7

Lorenzo Colitti   commited 2017-01-26 18:50:59 +09:00
e0462f583d
DO NOT MERGE frameworks-test: adding missing @SmallTest
This activates all frameworks-test tests in runs of the continuous
platform tests.

Test: $ runtest frameworks-net passes (expect Tether
Bug: 32561414

(cherry picked from commit 174b398594)

Change-Id: I84f9aecfbf9ebe07c6fcfec26acb2c2cfaae2d60

Hugo Benichi   commited 2017-01-24 15:42:45 +09:00
60d7dc9403
ConnectivityServiceTest: remove flaky waitForIdle test.
This patch removes testNotWaitingForIdleCausesRaceConditions() from
ConnectivityServiceTest because it is in nature flaky and prevents using
ConnectivityServiceTest as a patch presubmit check. Estimated failure
rate is 1/15 on Nexus 6p.

This patch also simplifies how ConnectivityServiceTest waits for
handlers to become idle by removing IdleableHandlerThread and turning it
into a signle static method.

Test: $ runtest frameworks-net
Bug: 31479480
Change-Id: I2d78709cbb61d5d01cd59cff326469417f73f1ab

Hugo Benichi   commited 2017-01-24 15:22:48 +09:00
56db715395
ConnectivityServiceTest: fix flaky tests
This patch adjusts timeouts in ConnectivityServiceTest to fix tests
known to fail spruriously.

Test: ran the following tests 500 times without observing any failure
 - testBackgroundNetworks()
 - testMultipleLingering()
 - testPacketKeepalives()
 - testSatisfiedNetworkRequestDoesNotTriggerOnUnavailable()
 - testSatisfiedThenLostNetworkRequestDoesNotTriggerOnUnavailable()
Bug: 32561414
Change-Id: I184fe7189aac768a65b927cc42eefaf8b1b3f930

Hugo Benichi   commited 2017-01-24 15:21:18 +09:00
8638392714
DO NOT MERGE Unit tests for NetworkNotificationManager
Test: new unit test, no functional changes.
Bug: 32198726

(cherry picked from commit 20904677af)

Change-Id: I123de68de9ae353b95edce89eb570cfbb5f8d9a3

Hugo Benichi   commited 2017-01-20 15:08:38 +09:00
ad903ab032
DO NOT MERGE: Show notification for always-on app VPN
This is the same notification as the one shown during legacy lockdown
mode, sans the 'reset' button.

The notification is only shown during times when VPN has not yet
established or has failed, for example during boot or after a crash.

Bug: 29123115

(cherry picked from commit 81f2dff176)

(cherry picked from commit 7b6200aa9f)

Change-Id: I42b4b24e25175bb7628b46a79431d2592644803c

Tony Mak   authored and   Lorenzo Colitti   commited 2017-01-18 19:08:44 +09:00
7bce27af36
DO NOT MERGE: ConnectivityServiceTest: fix testAvoidBadWifiSettings
This patch introduces an assertEventuallyThat helper function in
ConnectivityServiceTest which given a boolean function retries until the
function returns true or until a maximum retry time is reached.

This function is used to fix flakyness of testAvoidBadWifiSetting where
the Message posted by reevaluate() could reach the Handler's
MessageQueue after waitForIdle takes effect, resulting in the test to
fail.

Instead of fixing the flakyness by introdcing hard sleep times,
assertEventuallyThat is used to reduce the overall test time.

With this change the test has been observed to pass with 100% success
rate over 50000 invocations.

Test: $ runtest frameworks-net
Bug: 32561414

(cherry picked from commit ccf7f00258)

(cherry picked from commit aadb059a9f)

Change-Id: I432f90a699dadfef37a5d0a69e25050753340964

Hugo Benichi   authored and   Lorenzo Colitti   commited 2017-01-18 19:08:39 +09:00
ec41a56b55
DO NOT MERGE: Fix ConnectivityServiceTest testRequestBenchmark
This patch fixes flakyness of testRequestBenchmark by adjusting time
limit for callback registration from 100ms to 180ms, and time limits for
onAvailable and onLost triggers from 30ms to 40ms.

With these timeouts the test succeeds 100% over 5000 iterations.

When using 150ms for registration timeout, running the test 5000 times
fails 2 times.

When using 30ms for onLost timeout, running the test 5000 times fails
1 times.

In addition, this patch also cleans testRequestBenchmark and uses the
more stable SystemClock.elapsedRealtime() for duration measurements.

Test: $ runtest frameworks-net
Bug: 32561414

(cherry picked from commit cf7db79028)

(cherry picked from commit d0f492a893)

Change-Id: I3caf10025f203156a297c0b522f24768a18accc9

Hugo Benichi   authored and   Lorenzo Colitti   commited 2017-01-18 19:08:37 +09:00
9fb6ca3be3
DO NOT MERGE: [CS] Remove timeout event after first available
Guarantees that timeouts are only delivered if a network never
becomes available. Once a network is available the timeout is
canceled.

Bug: 31402633
Test: all timeout related unit tests pass (new one added)

(cherry picked from commit 88087226a6)

(cherry picked from commit 69e6a108a5)

Change-Id: I0cf1a2b7d25bc9912e03fca30621809a9071396c

Etan Cohen   authored and   Lorenzo Colitti   commited 2017-01-18 19:08:11 +09:00
dcdf130646
DO NOT MERGE: Move the connectivity tests to frameworks/base/tests/net.
This will give us a good place to put all the networking tests.

Fix: 31479480
Test: adb  shell am instrument -w -e notClass com.android.server.connectivity.tethering.TetherInterfaceStateMachineTest 'com.android.frameworks.tests.net/android.support.test.runner.AndroidJUnitRunner'  # PASS

(cherry picked from commit 384a9cb1f9)

Change-Id: I4c417c2ba0747d2085169e47ae4a99e93c4d8814

Lorenzo Colitti   commited 2017-01-18 19:08:05 +09:00
1747a76e9d
ConnectivityServiceTest: some fixes in CallbackInfo
- CallbackInfo becomes a static class so that it can be instantiated
  and looked at more easily than before.
- CallbackInfo gains hashCode() because it has equals().
- effectively final field are qualified final
- fixes bug when polling the next callback: poll() on a LinkedBlockingQueue
  returns null when timing out, which was not failing the test cleanly.

Test: ConnectivityServiceTest passes
Bug: 32561414
Change-Id: I64d382a35fe83f21bded98e6906c1ec70a8f1085

Hugo Benichi   commited 2017-01-16 11:15:04 +09:00
90755df180
DO NOT MERGE Stricter NetworkNotificationManagerTest
This patch changes NetworkNotificationManagerTest to populate extraInfo
of NetworkInfo in order to catch regressions in malformed format Strings
of log statements in NetworkNotificationManager.

Test: verified that the test fails when reintroducing the format String
bug.
Bug: 33737715

Change-Id: If14063554b8246d9d80cd222cb41c30dee121c5a

Hugo Benichi   commited 2016-12-20 05:02:28 +00:00
85a6c96ef3
DO NOT MERGE Network notifications: revamp keying scheme
This patch changes the (tag: String, id: Int) keying scheme for network
notifications so that TRON notification counters can count network
related notifications unambiguously.

TRON instruments all notifications shown for package "android" as well
as user interactions with these Notifications. These counters are
grouped by id. However the network notifications ("no internet" dialog,
"captive portal sign in" dialog, ...) use a static tag and a dynamic id
for keying notifications, preventing the counters to correctly
aggregate. In addition there is also the risk of collision with other
SystemUi notification ids not managed by NetworkNotificationManager.

In order to make the TRON counters useful for network notifications,
the id is now encoding the network notification type in a stable way
while the tag is used to uniquely identify network notifications.

Test: change covered by previously added new unit tests.
Bug: 32198726
Bug: 33030620

(cherry picked from commit 51727428fc)

Change-Id: Iadf7f15da38de28587090ed0395f15c24d4ad442

Hugo Benichi   commited 2016-12-15 20:31:11 +09:00
6cccb3bec3
DO NOT MERGE Unit tests for NetworkNotificationManager
Test: new unit test, no functional changes.
Bug: 32198726

(cherry picked from commit 20904677af)

Change-Id: Ib8a725cdd8c708ccb9cffad62321e0db8b27e593

Hugo Benichi   commited 2016-12-15 14:32:02 +09:00
f9b95ad8f3
DO NOT MERGE: frameworks-test: adding missing @SmallTest
This activates all frameworks-test tests in runs of the continuous
platform tests.

Test: $ runtest frameworks-net passes (expect Tether
Bug: 32561414
(cherry picked from commit 174b398594)

Change-Id: I7b0706a7e3368f971d508388e8ad4afc5de9d646

Hugo Benichi   authored and   Lorenzo Colitti   commited 2016-12-09 14:35:05 +09:00
b10b3e9c14
DO NOT MERGE: Netd events: record connect() success/errno
Test: $ runtest frameworks-net pass
Bug: 32198976

(cherry picked from commit 8b06bcdfd24100302818ae0e11ee751dd813d5cf)

Hugo Benichi   authored and   Lorenzo Colitti   commited 2016-12-09 14:34:39 +09:00
565f0b2d66
DO NOT MERGE: Show notification for always-on app VPN
This is the same notification as the one shown during legacy lockdown
mode, sans the 'reset' button.

The notification is only shown during times when VPN has not yet
established or has failed, for example during boot or after a crash.

Bug: 29123115

(cherry picked from commit 81f2dff176)

Change-Id: I929a05c24df01e21415535a333bb14ac4b790a9d

Tony Mak   authored and   Lorenzo Colitti   commited 2016-12-09 14:23:10 +09:00
7b6200aa9f
DO NOT MERGE: ConnectivityServiceTest: fix testAvoidBadWifiSettings
This patch introduces an assertEventuallyThat helper function in
ConnectivityServiceTest which given a boolean function retries until the
function returns true or until a maximum retry time is reached.

This function is used to fix flakyness of testAvoidBadWifiSetting where
the Message posted by reevaluate() could reach the Handler's
MessageQueue after waitForIdle takes effect, resulting in the test to
fail.

Instead of fixing the flakyness by introdcing hard sleep times,
assertEventuallyThat is used to reduce the overall test time.

With this change the test has been observed to pass with 100% success
rate over 50000 invocations.

Test: $ runtest frameworks-net
Bug: 32561414

(cherry picked from commit ccf7f00258)

Change-Id: If41a24989d5f65aeb439f68741f511b5eb53b18d

Hugo Benichi   authored and   Lorenzo Colitti   commited 2016-12-09 13:59:19 +09:00
aadb059a9f
DO NOT MERGE: Fix ConnectivityServiceTest testRequestBenchmark
This patch fixes flakyness of testRequestBenchmark by adjusting time
limit for callback registration from 100ms to 180ms, and time limits for
onAvailable and onLost triggers from 30ms to 40ms.

With these timeouts the test succeeds 100% over 5000 iterations.

When using 150ms for registration timeout, running the test 5000 times
fails 2 times.

When using 30ms for onLost timeout, running the test 5000 times fails
1 times.

In addition, this patch also cleans testRequestBenchmark and uses the
more stable SystemClock.elapsedRealtime() for duration measurements.

Test: $ runtest frameworks-net
Bug: 32561414

(cherry picked from commit cf7db79028)

Change-Id: I196ab9ef7f5abe456a783eed65db09279d2ecb8c

Hugo Benichi   authored and   Lorenzo Colitti   commited 2016-12-09 13:59:18 +09:00
d0f492a893
DO NOT MERGE: IpConnectivityMetrics: rate limit ApfProgramEvents
This patch uses the previously introduced TokenBucket to rate limit
ApfProgramEvents, still allowing for burst of ApfProgramEvents when a
new interface is set up (due to ipv4 provisioning, multicast lock, ipv6 RAs
triggering new APF program events in short amounts of time).

Test: new test in IpConnectivityMetricsTest
Bug: 1550402

(cherry picked from commit 811c4cec75)

Change-Id: Idb640dec13ba64180985544b9709a586af66eb6e

Hugo Benichi   authored and   Lorenzo Colitti   commited 2016-12-09 11:21:31 +09:00
f2de19cb5c
DO NOT MERGE: IpConnectivityMetrics reads buffer size in settings
Test: IpConnectivityMetricsTest passes. Also manually changed the new
setting and verified the buffer size is as expected after flushing the
buffer.
Bug: 32198637

(cherry picked from commit d5f78a08b4)

Change-Id: Iefbeac3a688b260fb3f92dfe0bfd9db28e26749d

Hugo Benichi   authored and   Lorenzo Colitti   commited 2016-12-09 11:21:26 +09:00
d8cee631fa
DO NOT MERGE: IpConnectivity metrics: add version number
This patch adds a version field to ipconnectivity.proto and populates it
to 2, which is the logical version number for NYC-MR2.

Test: IpConnectivity{EventBuilder,Metrics}Test pass
Bug: 32127906

(cherry picked from commit 79a739cbf3)

Change-Id: If8f167c0dc4c1abe0e235e2adfd131168a4ddc52

Hugo Benichi   authored and   Lorenzo Colitti   commited 2016-12-09 11:21:11 +09:00
8c938f0957
DO NOT MERGE: [CS] Remove timeout event after first available
Guarantees that timeouts are only delivered if a network never
becomes available. Once a network is available the timeout is
canceled.

Bug: 31402633
Test: all timeout related unit tests pass (new one added)

(cherry picked from commit 88087226a6)

Change-Id: I7cd3086544c881915fc6dbf14b87a24ab0cd8748

Etan Cohen   authored and   Lorenzo Colitti   commited 2016-12-08 17:13:37 +09:00
69e6a108a5
DO NOT MERGE: Move the connectivity tests to frameworks/base/tests/net.
This will give us a good place to put all the networking tests.

Fix: 31479480
Test: adb  shell am instrument -w -e notClass com.android.server.connectivity.tethering.TetherInterfaceStateMachineTest 'com.android.frameworks.tests.net/android.support.test.runner.AndroidJUnitRunner'  # PASS

(cherry picked from commit 384a9cb1f9)

Change-Id: I993eeaa5dec001c39389023f355f506129b356e7

Lorenzo Colitti   commited 2016-12-08 17:13:35 +09:00
c97a4587c3