Commit Graph

1350 Commits

Author SHA1 Message Date
Benedict Wong
dfcb691f2e Merge changes If6fa3598,Ia969f78f am: 5715ce685d
am: a5030c2f21

Change-Id: I62cdef952de3919f1efcf50817c762e3a1b65768
2019-05-31 10:58:13 -07:00
Benedict Wong
5715ce685d Merge changes If6fa3598,Ia969f78f
* changes:
  Remove mContext from IpSecBaseTest
  Add reflected-packet based data tests
2019-05-31 17:29:23 +00:00
Benedict Wong
02bfd4d1fb Merge "Cleanup IPsec CTS tests" am: 1d6880153b
am: 8493a945b8

Change-Id: I1e2f9bffb11b8a4a5dedd24045b8c36d79a1d5f4
2019-05-31 06:13:05 -07:00
Treehugger Robot
1d6880153b Merge "Cleanup IPsec CTS tests" 2019-05-31 12:54:49 +00:00
jovanak
aaf19bf9ce Merge "Fixing NetworkWatchlistTest#testGetWatchlistConfigHash for secondary users." into pie-cts-dev am: 4e9043b8cf am: e4c4e3e55a
am: 0ac46bc583

Change-Id: Ie5f5fd37e41024399c972ecbc644664b204baa66
2019-05-30 13:58:31 -07:00
jovanak
0ac46bc583 Merge "Fixing NetworkWatchlistTest#testGetWatchlistConfigHash for secondary users." into pie-cts-dev am: 4e9043b8cf
am: e4c4e3e55a

Change-Id: I67e8569e9976f99888e4aba0fde16d784d691477
2019-05-30 13:48:57 -07:00
jovanak
2045aa4777 Merge "Fixing NetworkWatchlistTest#testGetWatchlistConfigHash for secondary users." into pie-cts-dev
am: 4e9043b8cf

Change-Id: I5417f214cd337c3d0b517b160d753d808e9e3f59
2019-05-30 13:44:48 -07:00
jovanak
e4c4e3e55a Merge "Fixing NetworkWatchlistTest#testGetWatchlistConfigHash for secondary users." into pie-cts-dev
am: 4e9043b8cf

Change-Id: I0696ee72052294a96d50425284d074dda8ea809a
2019-05-30 13:37:48 -07:00
Luke Huang
0b35214faa Add bypass private DNS test case and null network test for DnsResolver cts
1. add test case for testing bypass Private DNS
2. add null network test
3. minor change for cleanup

Bug: 130594022
Test: atest DnsResolverTest

Merged-In: I8dd48f11baf92d953ded237204a3c2cd3b58581d
(cherry picked from commit da665a0a78a2919c3e2edabafec463de3de9ddb7)

Change-Id: Iabb100c51fd80eca5ab0284bc891f4fb98492e8b
2019-05-30 11:58:52 +00:00
Luke Huang
e848de43cd Merge "Add bypass private DNS test case and null network test for DnsResolver cts" am: 3df5aa1233
am: fbc990bf3b

Change-Id: I3cdfc9093915ceb27c5161c5b2f7dc9149b0dcb8
2019-05-30 04:36:33 -07:00
Luke Huang
3df5aa1233 Merge "Add bypass private DNS test case and null network test for DnsResolver cts" 2019-05-30 11:22:50 +00:00
Junyu Lai
87ac083a3b Fix keepalive CTS fail for devices with kernel older than 4.8
If kernel < 4.8 then it doesn't support get socket option
TCP_REPAIR_WINDOW, thus TCP keepalive cannot be supported.
However, it might still support NAT-T keepalive. Test TCP
keepalive only if it is supported by kernel.

Bug: 133652079
Test: atest android.net.cts.ConnectivityManagerTest#testMajorMinorVersionCompare \
    android.net.cts.ConnectivityManagerTest#testSocketKeepaliveLimit \
    android.net.cts.ConnectivityManagerTest#testSocketKeepaliveUnprivileged \
    android.net.cts.ConnectivityManagerTest#testKeepaliveUnsupported \
    android.net.cts.ConnectivityManagerTest#testCreateTcpKeepalive

Change-Id: I0a3ff07c482bb7c8cb05663678c10afcc0500861
Merged-In: I3f8456deea2b4ded762a413c8e27b58ce54ce0aa
(cherry picked from commit 57d91e6276b50bf0dd78f3643c4a979f584fcf38)
2019-05-30 06:26:52 +00:00
Junyu Lai
480e43b9e0 Merge "Fix keepalive CTS fail for devices with kernel older than 4.8" am: a73f8f6ec5
am: c53c7ff16b

Change-Id: I4441a1c4599cbe490d14563175df1003236c50b6
2019-05-29 22:22:49 -07:00
Junyu Lai
a73f8f6ec5 Merge "Fix keepalive CTS fail for devices with kernel older than 4.8" 2019-05-30 05:05:10 +00:00
paulhu
e3288fddcd Fix ConnectivityManagerApi23Test failures and remove duplication.
1. All ConnectivityManagerApi23Test were failed due to
   WifiManager#setWifiEnabled doesn't allow to use since
   Android Q. So we need to use shell command to enable/disable
   Wi-Fi instead.
2. Some methods are duplicated between
   ConnectivityManagerApi23Test and ConnectivityManagerTest, but
   they are not identical. So put these methods into
   ConnectivityUtils to clean up duplications and prevent fork
   happened again.

Bug: 133334943
Bug: 133209319
Test: Run the below tests on Crosshatch, Sailfish, Bonito.
      atest CtsNetApi23TestCases
      atest CtsNetTestCases

Change-Id: Ic37111cb12a46f5c36c2be887250c5d762216f6e
Merged-In: I075b7408d2a1e1145c7a9031075e07fa1db37fed
Merged-In: I0c02357eff07b98c1745de35d08ae6b8349de7fb
Merged-In: I04d1e1d096bcd4a9626cf9f00396fca7f9892a82
2019-05-30 01:25:20 +00:00
Paul Hu
2d99b49651 Merge "Fix ConnectivityManagerApi23Test failures and remove duplication." into qt-dev
am: ea66bf6632

Change-Id: I075b7408d2a1e1145c7a9031075e07fa1db37fed
2019-05-29 08:58:19 -07:00
paulhu
3cdc25cbc4 Fix ConnectivityManagerApi23Test failures and remove duplication.
1. All ConnectivityManagerApi23Test were failed due to
   WifiManager#setWifiEnabled doesn't allow to use since
   Android Q. So we need to use shell command to enable/disable
   Wi-Fi instead.
2. Some methods are duplicated between
   ConnectivityManagerApi23Test and ConnectivityManagerTest, but
   they are not identical. So put these methods into
   ConnectivityUtils to clean up duplications and prevent fork
   happened again.

Bug: 133334943
Bug: 133209319
Test: Run the below tests on Crosshatch, Sailfish, Bonito.
      atest CtsNetApi23TestCases
      atest CtsNetTestCases

Change-Id: Ic37111cb12a46f5c36c2be887250c5d762216f6e
2019-05-29 19:53:47 +08:00
junyulai
063b4e109e Fix keepalive CTS fail for devices with kernel older than 4.8
If kernel < 4.8 then it doesn't support get socket option
TCP_REPAIR_WINDOW, thus TCP keepalive cannot be supported.
However, it might still support NAT-T keepalive. Test TCP
keepalive only if it is supported by kernel.

Bug: 133652079
Test: atest android.net.cts.ConnectivityManagerTest#testMajorMinorVersionCompare \
    android.net.cts.ConnectivityManagerTest#testSocketKeepaliveLimit \
    android.net.cts.ConnectivityManagerTest#testSocketKeepaliveUnprivileged \
    android.net.cts.ConnectivityManagerTest#testKeepaliveUnsupported \
    android.net.cts.ConnectivityManagerTest#testCreateTcpKeepalive

Change-Id: I3f8456deea2b4ded762a413c8e27b58ce54ce0aa
2019-05-29 17:15:53 +08:00
Luke Huang
1f5f11e681 Add bypass private DNS test case and null network test for DnsResolver cts
1. add test case for testing bypass Private DNS
2. add null network test
3. minor change for cleanup

Bug: 130594022
Test: atest DnsResolverTest
Change-Id: I2da65fc1267a1975e014c0aafe2ae47df075b712
2019-05-29 12:04:48 +08:00
Benedict Wong
6d82630b8f Merge changes I3babc72d,I79d231e2
* changes:
  Fix IPsec CTS tests for interface address checking
  Convert IPsec tests to JUnit4
2019-05-28 21:44:06 +00:00
TreeHugger Robot
10b4eaa6f0 Merge "Convert Android.mk to Android.bp for net cts" into qt-dev 2019-05-28 08:14:58 +00:00
Luke Huang
971b79519a Convert Android.mk to Android.bp for net cts
Bug: 130623306
Test: Run the tests below on Crosshatch, Sailfish, Bonito
      atest CtsNativeNetTestCases CtsNativeNetDnsTestCases
      atest CtsNetTestCases

Merged-In: I5bb6de7a07494bd13d069212223691968d4f080e
(cherry picked from commit db29b055d9)

Change-Id: I0f1f70794c0ce303158f1aea54f0801379498071
2019-05-28 06:37:32 +00:00
Paul Hu
a138c9e487 Ignore all tests in IpSecManagerTunnelTest with instant apps
Test runner will crash while tring to get test network service
in IpSecManagerTunnelTest. Because MANAGE_TEST_NETWORKS
permission can't be granted to instant apps. So ignore all tests
in this file.

Bug: 133399750
Test: atest CtsNetTestCases --instant

Change-Id: I31b7e12a5a0021185851ba4435a6c42d457f34b6
Merged-In: Ia18c6bfe791692f8835b127adf734ce3d2a4ba95
Merged-In: I697333a7a64d794208d80112bdc1d1e50c5d2b56
Merged-In: I31b7e12a5a0021185851ba4435a6c42d457f34b6
(cherry picked from commit eb29c90465)
2019-05-27 01:19:17 +00:00
TreeHugger Robot
ac707024b2 Merge "Minor changes for DnsResolverTest" into qt-dev 2019-05-24 19:28:19 +00:00
jovanak
db6336c0b8 Fixing NetworkWatchlistTest#testGetWatchlistConfigHash for secondary users.
Avoids relying on external storage and using the hardcoded /sdcard/ path.
Unrooted adb does not have access to non-user 0 sdcard paths, and so the "cp"
command fails when the test runs in user 10.

Fixes: 121400865
Test: cts-tradefed run cts-dev -m CtsNetTestCases -t android.net.cts.NetworkWatchlistTest#testGetWatchlistConfigHash in user 10.
Change-Id: Idc667072bcfbbe159416fa7c7b6b19045b52041d
2019-05-24 12:21:50 -07:00
Henry Tung
8b37619dc6 Merge "Modify testNetworkSetupWizardPermission let it fit Factory Ota use case." into qt-dev
am: 7058c3fbd8

Change-Id: I942634bd70d37363e0078e9c352d34190ba0c2ad
2019-05-24 00:15:53 -07:00
Henry Tung
7058c3fbd8 Merge "Modify testNetworkSetupWizardPermission let it fit Factory Ota use case." into qt-dev 2019-05-24 07:03:31 +00:00
Paul Hu
829a040a81 Merge "Ignore all tests in IpSecManagerTunnelTest with instant apps" am: 57e952f8f8
am: 7510105d86

Change-Id: Ia18c6bfe791692f8835b127adf734ce3d2a4ba95
2019-05-23 23:39:38 -07:00
paulhu
5f7599b6d5 Ignore all tests in IpSecManagerTunnelTest with instant apps
Test runner will crash while tring to get test network service
in IpSecManagerTunnelTest. Because MANAGE_TEST_NETWORKS
permission can't be granted to instant apps. So ignore all tests
in this file.

Bug: 133399750
Test: atest CtsNetTestCases --instant
Change-Id: I5a096f20ec168133dbb65d27d3388c01e6ee895b
2019-05-24 11:37:37 +08:00
Benedict Wong
ee4eb2f35b Remove mContext from IpSecBaseTest
This commit removes the mContext from IpSecBaseTest, and replaces it
with InstrumentationRegistry.getContext().

Bug: 72950854
Test: Ran on devices, passing.
Change-Id: If6fa359825aa9d1f7d4c8d49aba7a34925c073ed
2019-05-22 11:08:26 -07:00
Benedict Wong
281d757df6 Cleanup IPsec CTS tests
This commit addresses comments from aosp/963067 and aosp/959617.

No behavioral/functional changes were made, only renames and minor style
nits addressed.

Bug: 72950854
Test: Ran on devices, working
Change-Id: I1702b91e245412f0142e9e47b7fb373b9b4e8126
2019-05-22 11:08:26 -07:00
Benedict Wong
5c79356068 Fix IPsec CTS tests for interface address checking
Fixes two potentially device/kernel specific, or flaky bugs:
1. Java interface checking by name seems to cache the lookup, resulting
in interface address checks occasionally failing (on delete).
2. Link-local addresses appear to be added on all links for some set of
kernels and devices.

This patch addresses both by only checking that the requested address
was added via a address-based NetworkInterface lookup.

Bug: 72950854
Test: Ran on sargo-eng on qt-dev/HEAD
Test: Manually verified that the addresses are indeed added/removed
Change-Id: I3babc72dfe72337c4d68facb1695aec15e504c90
Merged-In: I3babc72dfe72337c4d68facb1695aec15e504c90
(cherry picked from commit 4af108aacf)
2019-05-22 11:08:26 -07:00
Benedict Wong
60b0a6432b Add reflected-packet based data tests
This commit adds tests that reflect outgoing packets, flipping the outer
src/dst headers to avoid the need to tear down and rebuild the outer
TUN.

This allows us to at least test that our implementation can interoperate
with itself.

Bug: 72950854
Test: this, passing
Change-Id: Ia969f78f4c1a0c0a017f5aad425a68852ff4433a
2019-05-22 11:08:26 -07:00
Benedict Wong
a8d59c0183 Convert IPsec tests to JUnit4
This patch fixes an incompatibility where some tests in the same
hierarchy were using Junit3, and other Junit4

No functional test changes made

Bug: 72950854
Test: Ran on devices, working
Change-Id: I79d231e202ba25ad5f57b44b387bebd7f012aa95
Merged-In: I79d231e202ba25ad5f57b44b387bebd7f012aa95
(cherry picked from commit 0d08e91fe7)
2019-05-22 11:08:26 -07:00
Henry Tung
0097cb240d Modify testNetworkSetupWizardPermission let it fit Factory Ota use case.
Bug: 131304475
Test: run cts -m CtsNetTestCases -t android.net.wifi.cts.WifiManagerTest#testNetworkSetupWizardPermission
Change-Id: I41a457e6f31fcf3c45b171937d61b6342e3c0946
2019-05-22 11:18:07 +08:00
paulhu
435166fa86 Enable instant app mode for CtsNetTestCases
1. Indicating CtsNetTestCases support instant app mode but
   ignore some tests that cannot run in instant app mode.
2. Move some tests which need to test on API 23 into
   CtsNetApi23TestCases module due to instant app package
   must target at least API 26.

Bug: 123366918
Test: atest CtsNetTestCases --instant
Test: atest CtsNetApi23TestCases
Test: atest FrameworksNetTests

Change-Id: I4e828cbc48143e36c1be38b91c3c698122d4be5a
Merged-In: I1d78349d14763c133e1eab020d26865f46ff19a3
Merged-In: I931369875c86a396a898682009337cef1b918ba4
Merged-In: Ia8a45d6d751be94f9f707f879ea6ce4e6a45fae1
2019-05-22 01:11:10 +08:00
Paul Hu
a5f4202a7b Merge "Enable instant app mode for CtsNetTestCases" into qt-dev
am: 732767e5a9

Change-Id: I931369875c86a396a898682009337cef1b918ba4
2019-05-20 05:41:24 -07:00
paulhu
78e4a184a1 Enable instant app mode for CtsNetTestCases
1. Indicating CtsNetTestCases support instant app mode but
   ignore some tests that cannot run in instant app mode.
2. Move some tests which need to test on API 23 into
   CtsNetApi23TestCases module due to instant app package
   must target at least API 26.

Bug: 123366918
Test: atest CtsNetTestCases --instant
Test: atest CtsNetApi23TestCases
Test: atest FrameworksNetTests

Change-Id: I4e828cbc48143e36c1be38b91c3c698122d4be5a
2019-05-16 16:07:07 +08:00
Benedict Wong
701f04f642 Merge "Fix IPsec CTS tests for interface address checking" into qt-dev
am: b256c48d9b

Change-Id: Id490a48213f8ef6b2da320f682a8b6bea0ee4a26
2019-05-15 17:30:22 -07:00
Benedict Wong
4af108aacf Fix IPsec CTS tests for interface address checking
Fixes two potentially device/kernel specific, or flaky bugs:
1. Java interface checking by name seems to cache the lookup, resulting
in interface address checks occasionally failing (on delete).
2. Link-local addresses appear to be added on all links for some set of
kernels and devices.

This patch addresses both by only checking that the requested address
was added via a address-based NetworkInterface lookup.

Bug: 72950854
Test: Ran on sargo-eng on qt-dev/HEAD
Test: Manually verified that the addresses are indeed added/removed
Change-Id: I3babc72dfe72337c4d68facb1695aec15e504c90
2019-05-15 01:02:28 -07:00
TreeHugger Robot
c7774ffa16 Merge "Enforce IPsec Tunnel mode for Android Q" into qt-dev 2019-05-15 03:58:29 +00:00
Junyu Lai
6bbc8f71af Merge changes I60b9e9ae,I8be89116 am: c3db303f0b
am: 3fc54a07ae

Change-Id: I7dbe2879e00bb9f7614ca700b40fb54e7e3f1744
2019-05-13 07:24:29 -07:00
junyulai
bbf160a93d add cts for unprivileged keepalive slots
Currently, unprivileged Nat-T keepalives are limited to 1 slot
per uid. Add CTS to verify that the keepalive slots are limited
as customized for unprivileged requests.

Bug: 129371366
Test: atest android.net.cts
      .ConnectivityManagerTest#testSocketKeepaliveUnprivileged
      --generate-new-metrics 10

(Clean cherry-pick of aosp/957205)

Change-Id: I60b9e9ae9cf2b63490493ced9738cd2f402c3f9b
Merged-In: I60b9e9ae9cf2b63490493ced9738cd2f402c3f9b
2019-05-13 22:19:02 +08:00
junyulai
ad4c047f6d [KA14] add cts for keepalive limit test.
Per SDK requirement, OEM is required to support minimum number of
concurrent keepalives. Implement CTS to verify this.

Bug: 129371366
Test: atest android.net.cts
      .ConnectivityManagerTest#testSocketKeepaliveLimit
      --generate-new-metrics 10

(Clean cherry-pick of aosp/937026)

Change-Id: I8be89116bed5c4dedb2ca42b6d633aa9e8c6a49a
Merged-In: I8be89116bed5c4dedb2ca42b6d633aa9e8c6a49a
2019-05-13 22:16:50 +08:00
junyulai
80ec50b8ae add cts for unprivileged keepalive slots
Currently, unprivileged Nat-T keepalives are limited to 1 slot
per uid. Add CTS to verify that the keepalive slots are limited
as customized for unprivileged requests.

Bug: 129371366
Test: atest android.net.cts
      .ConnectivityManagerTest#testSocketKeepaliveUnprivileged
      --generate-new-metrics 10

Change-Id: I60b9e9ae9cf2b63490493ced9738cd2f402c3f9b
2019-05-13 18:10:36 +08:00
junyulai
b41bc72ea3 [KA14] add cts for keepalive limit test.
Per SDK requirement, OEM is required to support minimum number of
concurrent keepalives. Implement CTS to verify this.

Bug: 129371366
Test: atest android.net.cts
      .ConnectivityManagerTest#testSocketKeepaliveLimit
      --generate-new-metrics 10

Change-Id: I8be89116bed5c4dedb2ca42b6d633aa9e8c6a49a
2019-05-13 18:10:23 +08:00
Benedict Wong
236be238b6 Merge "Convert IPsec tests to JUnit4" into qt-dev
am: cb00fbdcc2

Change-Id: I55b51901ecf1166bc553b247e0c9681fb1e20058
2019-05-10 15:52:14 -07:00
Benedict Wong
0d08e91fe7 Convert IPsec tests to JUnit4
This patch fixes an incompatibility where some tests in the same
hierarchy were using Junit3, and other Junit4

No functional test changes made

Bug: 72950854
Test: Ran on devices, working
Change-Id: I79d231e202ba25ad5f57b44b387bebd7f012aa95
2019-05-10 20:05:43 +00:00
Benedict Wong
fbbb9c9c04 Enforce IPsec Tunnel mode for Android Q
This commit adds a second condition to whether the device is expected to
have the tunnel mode feature. If a device's first API/launch version is
Q or above, require IPsec tunnels

Bug: 72950854
Test: Ran on device with first API level < Q and == Q.
Merged-In: I545444bb483b0f5de45d00a07dc45aeb9e9cbdf7
Change-Id: I7b849ad24a04b6b7899a80f1856236b5ceb5a839
(cherry picked from commit d2465991d9)
2019-05-10 18:08:48 +00:00
Benedict Wong
d2465991d9 Merge "Enforce IPsec Tunnel mode for Android Q" am: 81e51bce50
am: ad380770a3

Change-Id: I545444bb483b0f5de45d00a07dc45aeb9e9cbdf7
2019-05-10 11:05:43 -07:00