Commit Graph

3316 Commits

Author SHA1 Message Date
jovanak
a105e2a2dc Merge "Fixing NetworkWatchlistTest#testGetWatchlistConfigHash for secondary users." into pie-cts-dev am: 4e9043b8cf am: e4c4e3e55a am: 0ac46bc583
am: aaf19bf9ce

Change-Id: I9b971fd3612e054f1349302d8b190f0b74f3cd00
2019-05-30 14:07:00 -07: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
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
Android Build Merger (Role)
9bca7fc6ce Merge "Add bypass private DNS test case and null network test for DnsResolver cts am: 0b35214faa am: 4f74c9ad43" into qt-r1-dev-plus-aosp 2019-05-30 16:41:12 +00:00
Luke Huang
6c5e745a97 Add bypass private DNS test case and null network test for DnsResolver cts am: 0b35214faa
am: 4f74c9ad43

Change-Id: Id8f405e59d8fbeb5aeff43edcd83e95f402ae46a
2019-05-30 09:37:52 -07:00
Luke Huang
76cd261ded Add bypass private DNS test case and null network test for DnsResolver cts am: 0b35214faa
am: 5e40a89885

Change-Id: I292b11ab154c5230fdb4ea0042796221976f0251
2019-05-30 09:37:32 -07:00
Luke Huang
4f74c9ad43 Add bypass private DNS test case and null network test for DnsResolver cts
am: 0b35214faa

Change-Id: I1c145e504cb63f6144364823f653bad0fbede707
2019-05-30 09:15:12 -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
4ae7244448 Merge "Add bypass private DNS test case and null network test for DnsResolver cts" am: 3df5aa1233 am: fbc990bf3b
am: e848de43cd

Change-Id: I7561e5e0727af716875ed72fe3b5ae9a9ec0e975
2019-05-30 04:41:11 -07: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
Android Build Merger (Role)
5b7166636c Merge "[automerger skipped] Merge "Fix keepalive CTS fail for devices with kernel older than 4.8" into qt-dev am: d2a0d577f0 am: 1d689279e0 -s ours am skip reason: change_id I3f8456deea2b4ded762a413c8e27b58ce54ce0aa with SHA1 063b4e109e is in history" into qt-r1-dev-plus-aosp 2019-05-30 07:42:30 +00:00
Junyu Lai
3ea41d799d [automerger skipped] Merge "Fix keepalive CTS fail for devices with kernel older than 4.8" into qt-dev am: d2a0d577f0 -s ours
am: f5e8bf5b79 -s ours
am skip reason: change_id I3f8456deea2b4ded762a413c8e27b58ce54ce0aa with SHA1 063b4e109e is in history

Change-Id: I2895f11abcbea5fe73ef91b359d8d634af77d810
2019-05-30 00:42:07 -07:00
Junyu Lai
ef42976d4b [automerger skipped] Merge "Fix keepalive CTS fail for devices with kernel older than 4.8" into qt-dev am: d2a0d577f0
am: 1d689279e0 -s ours
am skip reason: change_id I3f8456deea2b4ded762a413c8e27b58ce54ce0aa with SHA1 063b4e109e is in history

Change-Id: I7578ec0d99a036eec0d3ac1980fab8583d6588f6
2019-05-30 00:42:07 -07:00
Junyu Lai
f5e8bf5b79 [automerger skipped] Merge "Fix keepalive CTS fail for devices with kernel older than 4.8" into qt-dev
am: d2a0d577f0 -s ours
am skip reason: change_id I3f8456deea2b4ded762a413c8e27b58ce54ce0aa with SHA1 063b4e109e is in history

Change-Id: I7016712b4c6d095ecc9abdaba94ff412844366ac
2019-05-30 00:36:07 -07: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
fc865b4d6c Merge "Fix keepalive CTS fail for devices with kernel older than 4.8" am: a73f8f6ec5 am: c53c7ff16b
am: 480e43b9e0

Change-Id: I5b59cfcfbeb639f949667e3019dccf4ee84a9309
2019-05-29 22:27:57 -07: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
1cb6ce6c04 [automerger skipped] Merge "Fix ConnectivityManagerApi23Test failures and remove duplication." am: 5b2440cd35 am: b99373fca6 -s ours
am: b13869c598 -s ours
am skip reason: change_id I075b7408d2a1e1145c7a9031075e07fa1db37fed with SHA1 2d99b49651 is in history

Change-Id: I0264f0781595dfe939009dd9cc86a616a81d2b3b
2019-05-29 20:41:55 -07:00
paulhu
b13869c598 [automerger skipped] Merge "Fix ConnectivityManagerApi23Test failures and remove duplication." am: 5b2440cd35
am: b99373fca6 -s ours
am skip reason: change_id I075b7408d2a1e1145c7a9031075e07fa1db37fed with SHA1 2d99b49651 is in history

Change-Id: Ide7d2084b982f908f2a42747d3ab8117e74b36cf
2019-05-29 20:37:03 -07: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
Android Build Merger (Role)
2e97f51387 Merge "Merge "Fix ConnectivityManagerApi23Test failures and remove duplication." into qt-dev am: ea66bf6632 am: ac495ca119" into qt-r1-dev-plus-aosp 2019-05-29 16:10:31 +00:00
Paul Hu
5927e26534 Merge "Fix ConnectivityManagerApi23Test failures and remove duplication." into qt-dev am: ea66bf6632
am: ac495ca119

Change-Id: I8fcb3cc470ae3c5d77ebadf955198d10a4862b35
2019-05-29 09:10:03 -07:00
Paul Hu
3ed180e9bd Merge "Fix ConnectivityManagerApi23Test failures and remove duplication." into qt-dev am: ea66bf6632
am: 2d99b49651

Change-Id: I0c02357eff07b98c1745de35d08ae6b8349de7fb
2019-05-29 09:10:02 -07: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
22ef87b7de [automerger skipped] Merge changes I3babc72d,I79d231e2 am: 6d82630b8f am: 00343b0f5b -s ours
am: b66b0911c7 -s ours
am skip reason: change_id I3babc72dfe72337c4d68facb1695aec15e504c90 with SHA1 4af108aacf is in history

Change-Id: I417f4e39cbf9788e0aaecc1dbd48e9e6bd3bcc95
2019-05-28 15:01:41 -07:00
Benedict Wong
b66b0911c7 [automerger skipped] Merge changes I3babc72d,I79d231e2 am: 6d82630b8f
am: 00343b0f5b -s ours
am skip reason: change_id I3babc72dfe72337c4d68facb1695aec15e504c90 with SHA1 4af108aacf is in history

Change-Id: I9e29fc84ed9212339a85839c97cd5d4131ae7d3c
2019-05-28 14:53:01 -07: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
Android Build Merger (Role)
0dfb085a03 Merge "Merge "Convert Android.mk to Android.bp for net cts" into qt-dev am: 10b4eaa6f0 am: b79fde8f7c" into qt-r1-dev-plus-aosp 2019-05-28 08:33:20 +00:00
Luke Huang
cc76120fcc Merge "Convert Android.mk to Android.bp for net cts" into qt-dev am: 10b4eaa6f0
am: 8f58b93e39

Change-Id: I40204b4745dc08cb6056955a915a7c6a39807adc
2019-05-28 01:33:00 -07:00
Luke Huang
6c0a5aa856 Merge "Convert Android.mk to Android.bp for net cts" into qt-dev am: 10b4eaa6f0
am: b79fde8f7c

Change-Id: Ia5ae3e213c6db7ce89927dcede503de650de83b1
2019-05-28 01:32:59 -07:00
Luke Huang
b79fde8f7c Merge "Convert Android.mk to Android.bp for net cts" into qt-dev
am: 10b4eaa6f0

Change-Id: I12ef42f346d67fbb249bff1021a4f5c8b37ecdd3
2019-05-28 01:28:02 -07: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
Android Build Merger (Role)
74e472c995 Merge "[automerger skipped] Ignore all tests in IpSecManagerTunnelTest with instant apps am: a138c9e487 am: 298d129743 -s ours am skip reason: change_id Ia18c6bfe791692f8835b127adf734ce3d2a4ba95 with SHA1 829a040a81 is in history" into qt-r1-dev-plus-aosp 2019-05-27 11:08:12 +00:00
Paul Hu
c19f5c98b4 [automerger skipped] Ignore all tests in IpSecManagerTunnelTest with instant apps am: a138c9e487
am: 298d129743 -s ours
am skip reason: change_id Ia18c6bfe791692f8835b127adf734ce3d2a4ba95 with SHA1 829a040a81 is in history

Change-Id: Id71777e240a67e62a9191c2c253c81032f9b656f
2019-05-27 04:07:51 -07:00
Paul Hu
ffb91ac365 [automerger skipped] Ignore all tests in IpSecManagerTunnelTest with instant apps am: a138c9e487 -s ours
am: a29a169fb1 -s ours
am skip reason: change_id Ia18c6bfe791692f8835b127adf734ce3d2a4ba95 with SHA1 829a040a81 is in history

Change-Id: I3bf6c5f46789182cbf251a06a9c2809b626c8706
2019-05-27 04:07:50 -07:00
Paul Hu
a29a169fb1 [automerger skipped] Ignore all tests in IpSecManagerTunnelTest with instant apps
am: a138c9e487 -s ours
am skip reason: change_id Ia18c6bfe791692f8835b127adf734ce3d2a4ba95 with SHA1 829a040a81 is in history

Change-Id: I432b16b910227bced7ca8de0347b72c52a7459d2
2019-05-27 04:02:51 -07: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
Luke Huang
070fe0921c Merge "Minor changes for DnsResolverTest" into qt-dev am: ac707024b2
am: cb2ace5a9b

Change-Id: I01c4bb5f69e5b583371c8e772a6cb2b594d83f1e
2019-05-24 18:01:10 -07:00
Luke Huang
cb2ace5a9b Merge "Minor changes for DnsResolverTest" into qt-dev
am: ac707024b2

Change-Id: I95e48ad3bdb5004e4acced034a6d6efac6f031c2
2019-05-24 16:27:41 -07:00
Luke Huang
0439123cfe Merge "Minor changes for DnsResolverTest" into qt-dev am: ac707024b2
am: 7ff1c9d1a0

Change-Id: If438b61f29a1a00703001a2bcf8e53661ff110c2
2019-05-24 13:09:55 -07: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
0417c40f81 Merge "Modify testNetworkSetupWizardPermission let it fit Factory Ota use case." into qt-dev am: 7058c3fbd8
am: 8b37619dc6

Change-Id: Ib449e8fe5b2135bf6d1297ad19212f300ca47e66
2019-05-24 02:47:03 -07:00