Commit Graph

312 Commits

Author SHA1 Message Date
Yi Kong
d2fbf987ce Merge "Wait for network to resume in ConcurrencyTest" am: 3ba439e1b2
am: 52697c65f3

* commit '52697c65f38b93e979b854017d5669d3dbc00395':
  Wait for network to resume in ConcurrencyTest
2016-01-29 18:05:26 +00:00
Yi Kong
3ba439e1b2 Merge "Wait for network to resume in ConcurrencyTest" 2016-01-29 17:59:59 +00:00
Sergio Giro
fc9df7044f Merge "AbstractVerifierTest: adapt tests to reflect that tabs are preserved by the DN parser" am: 31cf2dfd30
am: 5982f2bc9a

* commit '5982f2bc9aa50360ebde52a721da71c6f72af526':
  AbstractVerifierTest: adapt tests to reflect that tabs are preserved by the DN parser
2016-01-28 15:05:40 +00:00
Sergio Giro
f2b8106f8d AbstractVerifierTest: adapt tests to reflect that tabs are preserved by the DN parser
Recently in
53f06c0d1d
I changed the tests to reflect the fact that tabs and newlines were
discarded.

I must have made some mistake verifying the change, as tabs seem preserved.

Changing the assertion for tabs.

Bug: 26517725
Change-Id: I514a3d670019e3e2911e2c69b434d0f577ff9b7a
2016-01-28 14:40:48 +00:00
Yi Kong
9980740cb9 Wait for network to resume in ConcurrencyTest
so that subsequent tests would not fail due to lack of network
connection.

Bug: 26182816
Change-Id: I6bc89897c9ad8e5966f03db7fc72169d3b973e53
2016-01-28 07:24:03 +08:00
Sergio Giro
fceca8f0e9 Merge "AbstractVerifierTest: adapt tests to the new behaviour concerning whitespace" am: c21b54c82b
am: 6aa2e158e4

* commit '6aa2e158e4494329087e48c26af1dcd128a1c048':
  AbstractVerifierTest: adapt tests to the new behaviour concerning whitespace
2016-01-18 12:23:29 +00:00
Sergio Giro
53f06c0d1d AbstractVerifierTest: adapt tests to the new behaviour concerning whitespace
In a DN like "cn=\na" the "\n" now gets trimmed, which makes sense.
Changing tests to reflect the change.

Bug: 26517725
Change-Id: I641687dd864524d66b925f555000edd44c970962
2016-01-18 12:14:09 +00:00
Dimitry Ivanov
5a78c96856 Merge "Untie MultinetworkApiTest from platform libc++.so" am: 2e14e9afaa
am: 4577e05c13

* commit '4577e05c13459a4fe27cd5e080eec04975160355':
  Untie MultinetworkApiTest from platform libc++.so
2016-01-12 21:28:10 +00:00
Dimitry Ivanov
04d19df9ca Untie MultinetworkApiTest from platform libc++.so
Bug: http://b/26512135
Change-Id: Ia01fd851fd7d2e50708620adf11d904e42de0b3b
2016-01-12 12:19:12 -08:00
Yi Kong
074b8b0de5 Merge "ConcurrencyTest: re-enable WiFi during teardown" am: a49620ff08
am: 8cf5a71ec0

* commit '8cf5a71ec0100fda09c19fc7116c1b50a0e5f096':
  ConcurrencyTest: re-enable WiFi during teardown
2015-12-31 14:43:17 +00:00
Yi Kong
27c101458c ConcurrencyTest: re-enable WiFi during teardown
Bug: 26182816
Change-Id: I3d5704794b17e0ec536a979a544a97a3e1f7b5c7
(cherry picked from commit f79ef7ff21ca9301035b9130d2d864112e8f9ae3)
2015-12-31 14:38:44 +00:00
Neil Fuller
b64304dd62 Merge "Isolate Local(Server|)SocketTest CTS tests" am: 85ac7d010e
am: 6962425a88

* commit '6962425a885f3e32431a15d8a5c34a78c633c777':
  Isolate Local(Server|)SocketTest CTS tests
2015-12-19 10:09:08 +00:00
Neil Fuller
85ac7d010e Merge "Isolate Local(Server|)SocketTest CTS tests" 2015-12-19 10:05:20 +00:00
Neil Fuller
8ff7b0e3a6 Isolate Local(Server|)SocketTest CTS tests
Tests are failing with "Address in use". It does not repeat when the
test is run locally.

It is unclear why this has started happening: all tests should be
closing their respective sockets. This change will either prevent
conflicts between tests or help debug if they continue to fail.

Bug: 26140463
Change-Id: I72172b70e00936a6cca9d35c7977fe191621b0cc
2015-12-14 13:47:55 +00:00
Sergio Giro
6449e09912 Merge "frameworks/base: add tests for AbstractVerifier" am: f4756068ed
am: 05c2b772a3

* commit '05c2b772a3b80b8bcfe384fac47dd3efb63480fc':
  frameworks/base: add tests for AbstractVerifier
2015-11-27 14:16:39 +00:00
Sergio Giro
615ffeb922 frameworks/base: add tests for AbstractVerifier
DistinguishedNameParser was moved to frameworks/base in
46972b2d825a2368706e7d2210559ca18fc2b332

Testing its behaviour through AbstractVerifier.

DistinguishedNameParserTest adapted from
f7ce6a3b235a9aaf884d3b96e50d6b249dd770e0

Bug: 25882613

Change-Id: Idf901503d96df8b160d84f4f88dbf79359f0e035
2015-11-27 13:55:32 +00:00
Daniel Xie
975335db32 Merge "Don\'t run Wifi scan timestamp tests when location is turned off." into marshmallow-cts-dev am: 57031aa47e am: 3f0866e144 am: 9bfb43c08f am: 3b7e1623b3
am: df3a267558

* commit 'df3a2675583188747cc04e7e9daa141f7ca3b53d':
  Don't run Wifi scan timestamp tests when location is turned off.
2015-11-17 01:45:02 +00:00
Wei Wang
abe587984a Don't run Wifi scan timestamp tests when location is turned off.
Bug:24957400
Change-Id: I891040ffc0808d62a8f5f1bb20fd633b9f7f482c
2015-11-10 14:23:55 -08:00
Daniel Xie
935fba1ab2 Squashed mnc-dev changes:
This contains all of the changes from b54aa51 to
791e51a on mnc-dev, except the changes
to tests/tests/security.

Bug: 24846656
Change-Id: I01f53a1a238ac49f86928e0e22796dc73e0e34af
2015-10-19 16:01:03 -07:00
Paul Jensen
c9ab5af9f2 am 8fafeb28: am df4f2629: am a1b4d2de: am 22e42b48: resolved conflicts for 3e4042eb to mnc-dev
* commit '8fafeb28797eb5ff96ebde62b1e7178ab56f29fe':
  CTS: verify ConnectivityManager.requestNetwork throws for restricted networks
2015-09-25 18:09:20 +00:00
Paul Jensen
22e42b48f5 resolved conflicts for 3e4042eb to mnc-dev
Change-Id: I3476d55641288b21a1609a8e72f37012d86bad03
2015-09-25 07:28:26 -04:00
Paul Jensen
3e4042eb78 am 063f9718: am 358b4b14: am 8c04baef: am e287a5c6: Merge "CTS: verify ConnectivityManager.requestNetwork throws for restricted networks" into lmp-dev
* commit '063f971859d0ef5ac96b69de345cd94fd4788b7e':
  CTS: verify ConnectivityManager.requestNetwork throws for restricted networks
2015-09-25 11:09:06 +00:00
Paul Jensen
063f971859 am 358b4b14: am 8c04baef: am e287a5c6: Merge "CTS: verify ConnectivityManager.requestNetwork throws for restricted networks" into lmp-dev
* commit '358b4b140f9811667471596293fc1f5cfa2d536c':
  CTS: verify ConnectivityManager.requestNetwork throws for restricted networks
2015-09-25 11:02:47 +00:00
Paul Jensen
358b4b140f am 8c04baef: am e287a5c6: Merge "CTS: verify ConnectivityManager.requestNetwork throws for restricted networks" into lmp-dev
* commit '8c04baef4cb8066712c6b1af345781b41a17aa8a':
  CTS: verify ConnectivityManager.requestNetwork throws for restricted networks
2015-09-25 10:57:05 +00:00
Paul Jensen
e287a5c6d8 Merge "CTS: verify ConnectivityManager.requestNetwork throws for restricted networks" into lmp-dev 2015-09-25 10:45:39 +00:00
Paul Jensen
45984684aa CTS: verify ConnectivityManager.requestNetwork throws for restricted networks
Bug:21900139
Change-Id: Ib026bc4e66437f015729bdf7c923145ffa41fbde
2015-09-22 08:07:46 -04:00
JP Abgrall
740064e97f am ab0f0fe8: Merge "Fix CTS build" into lollipop-cts-dev
* commit 'ab0f0fe884c280adcde0259f4692cebfb3d0bf08':
  Fix CTS build
2015-09-22 03:45:28 +00:00
Amith Dsouza
2d22fa9b07 am 2e4ce593: Merge "LocalSocketTest.testAccessors: fix the *SendBufferSize* test" into lollipop-cts-dev
* commit '2e4ce593e3b6c611783bc660f95e2e783e004cd3':
  LocalSocketTest.testAccessors: fix the *SendBufferSize* test
2015-09-15 17:00:13 +00:00
Daniel Xie
624951463c am 1840edcd: Merge "Accept more than one SD in NsdManagerTest" into lollipop-cts-dev
* commit '1840edcd80a4bc62bae117848ef64a5c4bf83ef2':
  Accept more than one SD in NsdManagerTest
2015-09-15 17:00:07 +00:00
Daniel Xie
f4efe32775 am e260657a: am 45643db7: am 03786bc4: am 545427fc: Merge "Support WiFi only device at runtime." into kitkat-cts-dev
* commit 'e260657a086ed507a80e8809315d22495faa15e4':
  Support WiFi only device at runtime.
2015-09-12 00:31:35 +00:00
Daniel Xie
e260657a08 am 45643db7: am 03786bc4: am 545427fc: Merge "Support WiFi only device at runtime." into kitkat-cts-dev
* commit '45643db78515be3603ad2a17244d21badfd89a25':
  Support WiFi only device at runtime.
2015-09-10 18:25:59 +00:00
Takayuki Hoshi
f8e2416639 am 2212f189: Merge "Normalize ipv6.cts.PingTest#testLoopbackPing\'s packet size" into lmp-sprout-dev
* commit '2212f189a42be9b52e37a10e8b94d3d07c51e109':
  Normalize ipv6.cts.PingTest#testLoopbackPing's packet size
2015-09-10 04:41:04 +00:00
Unsuk Jung
bfd0aabaa5 am b8ad8a1a: am 17607b8a: am 4106602e: am 7e84d75c: Merge "resolve merge conflicts of a97c792 to kitkat-cts-dev" into kitkat-cts-dev
* commit 'b8ad8a1a990597951faaf9e82722e628ff74c0e3':
  Fix CTS android.net package testTrafficStatsForLocalhost seldom fail issue
2015-09-10 03:47:23 +00:00
Unsuk Jung
b8ad8a1a99 am 17607b8a: am 4106602e: am 7e84d75c: Merge "resolve merge conflicts of a97c792 to kitkat-cts-dev" into kitkat-cts-dev
* commit '17607b8a36287108099db71b9a15f20d64434203':
  Fix CTS android.net package testTrafficStatsForLocalhost seldom fail issue
2015-09-09 22:19:06 +00:00
Erik Kline
551fccedf3 am e1bbb869: am 19467ab3: am 28c60e6e: am d20107df: Merge "Add trivial retransmission of QUIC packets" into mnc-dev
* commit 'e1bbb86947e2933f192b760e25551d0edc00597d':
  Add trivial retransmission of QUIC packets
2015-08-19 23:08:47 +00:00
Erik Kline
f19c63e5b1 Add trivial retransmission of QUIC packets
Also:
    - correct use of strlcpy()
    - add some more logging

Bug: 21833352
Bug: 22181260
Change-Id: Id153e17b8d4d32a35d38846599aa51147739e163
2015-08-20 04:45:08 +09:00
Lorenzo Colitti
7f6e116a6f am 3bf4612e: am 35a548e1: am ca6150b2: am c2aaf355: Merge "Update CTS for unsupported legacy ConnectivityManager APIs" into mnc-dev
* commit '3bf4612e6462a37242f3784405199d1ec6ba8093':
  Update CTS for unsupported legacy ConnectivityManager APIs
2015-08-07 02:13:44 +00:00
Lorenzo Colitti
cfc277c7f1 Update CTS for unsupported legacy ConnectivityManager APIs
http://ag/736511 made the deprecated ConnectivityManager routing
APIs {start,stop}UsingNetworkFeature and requestRouteToHost throw
exceptions for apps whose target SDK version is 23 or above. Move
the tests for these APIs to a new APK that targets SDK version 22
and update the current test APK to ensure that they throw an
exception.

Bug: 22977863
Bug: 23003441
Bug: 23003635
Change-Id: Icf58e928fdc0018d977ce8aa315866659d32debb
2015-08-07 10:45:33 +09:00
Daniel Xie
c4662496ff am f0c0af79: am 57221480: am 05dc8dbc: am b9453ff9: am 9417d728: am ea9003d9: am 2b44bd54: am 42445696: Merge "Support WiFi only device at runtime." into kitkat-cts-dev automerge: 545427f automerge: f6915b6
* commit 'f0c0af79eb0bb8f67e051c845a1a96e402bb8241':
  Support WiFi only device at runtime.
2015-08-06 07:26:48 +00:00
Daniel Xie
b9453ff934 am 9417d728: am ea9003d9: am 2b44bd54: am 42445696: Merge "Support WiFi only device at runtime." into kitkat-cts-dev automerge: 545427f automerge: f6915b6
* commit '9417d7288ddd37b5d2e347a724afb76cf987f70f':
  Support WiFi only device at runtime.
2015-08-06 05:11:27 +00:00
Daniel Xie
9417d7288d am ea9003d9: am 2b44bd54: am 42445696: Merge "Support WiFi only device at runtime." into kitkat-cts-dev automerge: 545427f automerge: f6915b6
* commit 'ea9003d9692e1fc1384a02686c3d36f195d9d55e':
  Support WiFi only device at runtime.
2015-08-05 18:28:01 +00:00
Jim Guggemos
261d045317 am ada73333: am e8bc6e3f: am 0334b8ec: am b50470fc: Merge "New tests for (un)registerNetworkCallback with PendingIntent." into mnc-dev
* commit 'ada73333baec57907cbcba76ce38ef47ad9800da':
  New tests for (un)registerNetworkCallback with PendingIntent.
2015-07-30 00:28:07 +00:00
Jim Guggemos
b50470fcea Merge "New tests for (un)registerNetworkCallback with PendingIntent." into mnc-dev 2015-07-29 23:27:19 +00:00
Fyodor Kupolov
ecb47a6298 am c678fb40: am 6ec28d2b: am 9fc4e8cc: am 6a4d762c: Merge "Fix for ScanResultTest and WifiManagerTest" into mnc-dev
* commit 'c678fb40ffb5acddd5d5551f971b98827a8cab93':
  Fix for ScanResultTest and WifiManagerTest
2015-07-29 22:47:41 +00:00
Fyodor Kupolov
e57e9bcb96 Fix for ScanResultTest and WifiManagerTest
Added ACCESS_COARSE_LOCATION permission - it is now required to receive Wi-Fi
scan results(b/21852542).

Bug: 22790182
Change-Id: Idb72c200b08f7e4e95571504ab42c9e706f5c921
2015-07-29 11:24:34 -07:00
Daniel Xie
ea9003d969 am 2b44bd54: am 42445696: Merge "Support WiFi only device at runtime." into kitkat-cts-dev automerge: 545427f automerge: f6915b6
* commit '2b44bd54f88a4374ea631994650d464df4d6fe4e':
  Support WiFi only device at runtime.
2015-07-28 18:15:16 +00:00
Jim Guggemos
9030d1aceb New tests for (un)registerNetworkCallback with PendingIntent.
Fixed up flakiness if WiFi was disabled before executing
the test.

Bug: 21833352
Change-Id: Ief7e12c4a7151722ec926ac38ced9f8903cdb607
2015-07-28 00:13:02 -06:00
Erik Kline
0d090207ba am 26730e80: am 5ca3ddb5: am 1685838d: am d56f0067: Merge "QUIC port 80 support is going away" into mnc-dev
* commit '26730e807e491611e0489bb4aaa19f7f331dd9f5':
  QUIC port 80 support is going away
2015-07-27 06:03:42 +00:00
Erik Kline
e2815d360a QUIC port 80 support is going away
Change-Id: I29a81e67d121b2e7e832e9e0d5e798d70b4c594a
2015-07-27 13:45:15 +09:00
Daniel Xie
424456969a Merge "Support WiFi only device at runtime." into kitkat-cts-dev automerge: 545427f
automerge: f6915b6

* commit 'f6915b6f02ea3ff39bab6bd993072c323f470f27':
  Support WiFi only device at runtime.
2015-07-25 04:58:57 +00:00