Commit Graph

3352 Commits

Author SHA1 Message Date
Paul Hu
6787f39d40 Merge "Fix ConnectivityManagerApi23Test failures and remove duplication." into qt-dev am: ea66bf6632 am: 2d99b49651
am: 3ed180e9bd

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

Change-Id: I68829eb351ff4283e29da6208a23b0c1f263bdbf
2019-05-28 15:27:16 -07: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
Luke Huang
4eb93a2bd8 [automerger skipped] Merge "Merge "Convert Android.mk to Android.bp for net cts" into qt-dev am: 10b4eaa6f0 am: b79fde8f7c" into qt-r1-dev-plus-aosp
am: 0dfb085a03 -s ours
am skip reason: change_id I5bb6de7a07494bd13d069212223691968d4f080e with SHA1 db29b055d9 is in history

Change-Id: Ie03bc15d25b8292212a84790d51449015b247e43
2019-05-28 01:39:33 -07:00
Luke Huang
757a1caa8f [automerger skipped] Merge "Convert Android.mk to Android.bp for net cts" into qt-dev am: 10b4eaa6f0 am: 8f58b93e39
am: cc76120fcc -s ours
am skip reason: change_id I5bb6de7a07494bd13d069212223691968d4f080e with SHA1 db29b055d9 is in history

Change-Id: I5a5c2f5acce645ad11937bd4bcbb86342e7092f1
2019-05-28 01:38:07 -07: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
Paul Hu
f98653a0d8 Merge "[automerger skipped] Ignore all tests in IpSecManagerTunnelTest with instant apps am: a138c9e487 am: 298d129743 -s ours
am: 74e472c995 -s ours
am skip reason: change_id Ia18c6bfe791692f8835b127adf734ce3d2a4ba95 with SHA1 829a040a81 is in history

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

Change-Id: Iba4435832ffe93b3157dcc610e6ef5005ed5ba64
2019-05-27 10:29:46 -07: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
393feda86c [automerger skipped] Merge "Minor changes for DnsResolverTest" into qt-dev am: ac707024b2 am: cb2ace5a9b
am: 070fe0921c -s ours
am skip reason: change_id Ibe5b5396d7d7563643eae14940934786903a4f64 with SHA1 a2f73df47b is in history

Change-Id: I7ddca19c48104572a10004baaa7d2c0bc35e231e
2019-05-24 19:59:55 -07:00
Luke Huang
ea7eac44e2 [automerger skipped] Merge "Minor changes for DnsResolverTest" into qt-dev am: ac707024b2 am: 7ff1c9d1a0
am: 0439123cfe -s ours
am skip reason: change_id Ibe5b5396d7d7563643eae14940934786903a4f64 with SHA1 a2f73df47b is in history

Change-Id: I7023195d36bef7c09fb219b87a0b83e4ac7ad724
2019-05-24 19:27:59 -07:00
Henry Tung
53f1860afa Merge "Modify testNetworkSetupWizardPermission let it fit Factory Ota use case." into qt-dev am: 7058c3fbd8 am: 8b37619dc6
am: 0417c40f81

Change-Id: Ia9e55df7311ac4ed066686b04a905f48e90ba874
2019-05-24 18:53:18 -07:00
Paul Hu
eb29c90465 Merge "Ignore all tests in IpSecManagerTunnelTest with instant apps" am: 57e952f8f8 am: 7510105d86 am: 829a040a81
am: eb452c132b

Change-Id: I31b7e12a5a0021185851ba4435a6c42d457f34b6
2019-05-24 18:52:54 -07:00
Henry Tung
c22e8292a6 Merge "Modify testNetworkSetupWizardPermission let it fit Factory Ota use case." into qt-dev am: 7058c3fbd8 am: 7c6a82be82
am: ef230a98bb

Change-Id: I8a607c3655caea9920d61d8376a5e799e230f088
2019-05-24 18:14:10 -07: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
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
Paul Hu
eb452c132b Merge "Ignore all tests in IpSecManagerTunnelTest with instant apps" am: 57e952f8f8 am: 7510105d86
am: 829a040a81

Change-Id: I697333a7a64d794208d80112bdc1d1e50c5d2b56
2019-05-24 02:43:26 -07:00
Henry Tung
ef230a98bb Merge "Modify testNetworkSetupWizardPermission let it fit Factory Ota use case." into qt-dev am: 7058c3fbd8
am: 7c6a82be82

Change-Id: I796034207ed597c39935f773c233a54e7547c03b
2019-05-24 00:26:47 -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
Paul Hu
3cad5ddf54 [automerger skipped] Merge "Enable instant app mode for CtsNetTestCases" am: 5013b29af8 am: b073a29470 -s ours am: 0f897b8d71 -s ours
am: 4375670a45 -s ours
am skip reason: change_id I1d78349d14763c133e1eab020d26865f46ff19a3 with SHA1 d02d469390 is in history

Change-Id: Ie083cfec311b37f9d8d20baf3ac83d1bfea96650
2019-05-23 12:50:01 -07:00
Paul Hu
4375670a45 [automerger skipped] Merge "Enable instant app mode for CtsNetTestCases" am: 5013b29af8 am: b073a29470 -s ours
am: 0f897b8d71 -s ours
am skip reason: change_id I931369875c86a396a898682009337cef1b918ba4 with SHA1 a5f4202a7b is in history

Change-Id: I86d951bf470cdec18147a5cb2f33527301a4ecb0
2019-05-22 14:10:55 -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
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
Paul Hu
0f897b8d71 [automerger skipped] Merge "Enable instant app mode for CtsNetTestCases" am: 5013b29af8
am: b073a29470 -s ours
am skip reason: change_id I931369875c86a396a898682009337cef1b918ba4 with SHA1 a5f4202a7b is in history

Change-Id: Ibf168d3166a11309d6a1a1ab5849d737bae436bd
2019-05-22 10:29:01 -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
d02d469390 Merge "Enable instant app mode for CtsNetTestCases" into qt-dev am: 732767e5a9 am: a5f4202a7b
am: e7e90600ec

Change-Id: I1d78349d14763c133e1eab020d26865f46ff19a3
2019-05-20 09:10:49 -07:00
Paul Hu
e7e90600ec Merge "Enable instant app mode for CtsNetTestCases" into qt-dev am: 732767e5a9
am: a5f4202a7b

Change-Id: Ia8a45d6d751be94f9f707f879ea6ce4e6a45fae1
2019-05-20 06:42:59 -07: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
Xin Li
d5ef4dbdbf [automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master. am: 0f12601ff3 -s ours am: 79d906ff81 -s ours am: ede550a504
am: d8cf850578 -s ours
am skip reason: subject contains skip directive

Change-Id: I4c220c4ce16694a153bbb17971dd461acb6e0157
2019-05-17 09:51:30 -07:00