From eeea3d5510a065c55baaa55dd6fc3d1e15eaaf3d Mon Sep 17 00:00:00 2001 From: Etan Cohen Date: Thu, 14 Jun 2018 08:51:43 -0700 Subject: [PATCH 1/3] [RTT][CTS] Add information to assert to help debug failures Modify the assert message to print out the # of failures and the total number of iterations. Will help diagnose scope of test failures. Bug: 109836816 Test: atest WifiRttTest Change-Id: Ic4d5b6844225edbd9704694c539e31754b7a340c --- tests/cts/net/src/android/net/wifi/rtt/cts/WifiRttTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/cts/net/src/android/net/wifi/rtt/cts/WifiRttTest.java b/tests/cts/net/src/android/net/wifi/rtt/cts/WifiRttTest.java index 1171a6b7de..74a0c3dfbc 100644 --- a/tests/cts/net/src/android/net/wifi/rtt/cts/WifiRttTest.java +++ b/tests/cts/net/src/android/net/wifi/rtt/cts/WifiRttTest.java @@ -157,7 +157,8 @@ public class WifiRttTest extends TestBase { reportLog.submit(); // Analyze results - assertTrue("Wi-Fi RTT failure rate exceeds threshold", + assertTrue("Wi-Fi RTT failure rate exceeds threshold: FAIL=" + numFailures + ", ITERATIONS=" + + NUM_OF_RTT_ITERATIONS, numFailures <= NUM_OF_RTT_ITERATIONS * MAX_FAILURE_RATE_PERCENT / 100); if (numFailures != NUM_OF_RTT_ITERATIONS) { double distanceAvg = distanceSum / (NUM_OF_RTT_ITERATIONS - numFailures); From 841d4711be7b787b400fad7bd16fed0c7a00518d Mon Sep 17 00:00:00 2001 From: Sudheer Shanka Date: Tue, 19 Jun 2018 19:30:31 -0700 Subject: [PATCH 2/3] Use a different key for signing networkpolicy test app. One of the preparation steps for running cts involves loading up the sim card with the key used to sign CtsCarrierApiTestCases.apk. It means if the same key is used for signing networkpolicy test app too, then the app is considered as carrier privileged by the system and can't be forced into app standby state. Fixes: 80077890 Test: cts-tradefed run singleCommand cts-dev -m CtsHostsideNetworkTests -t \ com.android.cts.net.HostsideRestrictBackgroundNetworkTests#testDataSaverMode_disabled Change-Id: Iaa9f4fabe83430fa42b6f67c1025db41a5e1d938 --- tests/cts/hostside/app2/Android.mk | 2 ++ tests/cts/hostside/certs/README | 2 ++ tests/cts/hostside/certs/cts-net-app.pk8 | Bin 0 -> 1219 bytes tests/cts/hostside/certs/cts-net-app.x509.pem | 19 ++++++++++++++++++ 4 files changed, 23 insertions(+) create mode 100644 tests/cts/hostside/certs/README create mode 100644 tests/cts/hostside/certs/cts-net-app.pk8 create mode 100644 tests/cts/hostside/certs/cts-net-app.x509.pem diff --git a/tests/cts/hostside/app2/Android.mk b/tests/cts/hostside/app2/Android.mk index 9a4a30fbff..5c0bae194b 100644 --- a/tests/cts/hostside/app2/Android.mk +++ b/tests/cts/hostside/app2/Android.mk @@ -32,4 +32,6 @@ LOCAL_DEX_PREOPT := false # Tag this module as a cts test artifact LOCAL_COMPATIBILITY_SUITE := cts vts general-tests +LOCAL_CERTIFICATE := cts/hostsidetests/net/certs/cts-net-app + include $(BUILD_CTS_SUPPORT_PACKAGE) diff --git a/tests/cts/hostside/certs/README b/tests/cts/hostside/certs/README new file mode 100644 index 0000000000..b660a82dc8 --- /dev/null +++ b/tests/cts/hostside/certs/README @@ -0,0 +1,2 @@ +# Generated with: +development/tools/make_key cts-net-app '/CN=cts-net-app' diff --git a/tests/cts/hostside/certs/cts-net-app.pk8 b/tests/cts/hostside/certs/cts-net-app.pk8 new file mode 100644 index 0000000000000000000000000000000000000000..1703e4ee340b7c7ab818097cefbbf95fb86f3747 GIT binary patch literal 1219 zcmV;!1U&mNf&{+;0RS)!1_>&LNQUrsW5^Br2+u}0)hbn0N#A&vRMl( z)K7&#gN-YqA(ePu&=E2o$Vjep&N^#?J+IQe_UD^8vWC4%PBxI-ME{s%p~72w0ZU@; zaXKTG43uCz5lGMl@ha*FIBFHPR{XV|cKf1`B_%f8?!Ujr zt-{>0C4_u?`%vIYq{z#o&|wc%#UbbC#EF~*3eXtI#Pu@b#2AEmesXH!;BA|+2B81W z!Zu8OMUNETxR$5$c?)i;hZYR4J*6YT$pCc&@}h3pQGsU#%?m@^a{>ba009Dm0RaHk zc>v0s8?m!kl+%O!>N@ze<-9;f(^2U#XFDru6^Rdi7GW7mTF+$(jvu=f&c6qwe0xQc z-YV8)osrJ&&LK`cr5XVSk|=+5h9S}kmdcGs++ig(JtFrKB&6at^XSEN7gbjf(l>>Q zW5q!7d>b5VnALd8DRw?XvqUfpAAaDQ)mpy#BAh*U&nzY5KA?dt?&F!_gTW_hO&aG? zFz!^L2yHTF#V@X&LqF|!Q4`{WkX^!rOP6AzE3-+ExKAD|AnK7^^w$v-bH;VQMuXQG z^wqpIj+;*3h|p36xkZ4_k2@ee;ehD~XA7iWt0O?}W4hlp!7008eHpZ&=5xtRJbcFmSVJik5H=O_+OcDr64K?)M2Tx(p#1Bj!W}szK*F#xG5_9njbtuN zvAj31ay#p;XUyF~^2T$(v1bpJYKX(0Hjh1=a0St$<@BH?5pD>(7CE0M%ug3w#-4iu zfq)5bl2l+u5>xWKztT8zHPHfrfdIA^X{1GXSD$}V6aG5WdD+aZ)3UOU)PA-Q{> z3qB8AR`51~p;B8g;f0T+gwBF{nn#RZ*xS3do08bdRK^ktwT+BuQ7nn@r4GbJz7x8u zX+HvifdH9pz)+xQ>TMce;8KGy?O90aj>ISS3b7$HM<}?=R_^2Dov>KX=fW4gZ0oL# z4TlXtL8u4+=w-H(!dkS=iZ?}Kj79RMiGFcJL@(@4Kz{D4>0IF9=(5M)>0ajZaHD0q hCv|>6qS`CJYwg-kjl|iF9l$*x Date: Tue, 19 Jun 2018 19:30:31 -0700 Subject: [PATCH 3/3] Use a different key for signing networkpolicy test app. One of the preparation steps for running cts involves loading up the sim card with the key used to sign CtsCarrierApiTestCases.apk. It means if the same key is used for signing networkpolicy test app too, then the app is considered as carrier privileged by the system and can't be forced into app standby state. Fixes: 77861812 Test: cts-tradefed run singleCommand cts-dev -m CtsHostsideNetworkTests -t \ com.android.cts.net.HostsideRestrictBackgroundNetworkTests#testDataSaverMode_disabled Change-Id: Iaa9f4fabe83430fa42b6f67c1025db41a5e1d938 Merged-In: Iaa9f4fabe83430fa42b6f67c1025db41a5e1d938 --- tests/cts/hostside/app2/Android.mk | 2 ++ tests/cts/hostside/certs/README | 2 ++ tests/cts/hostside/certs/cts-net-app.pk8 | Bin 0 -> 1219 bytes tests/cts/hostside/certs/cts-net-app.x509.pem | 19 ++++++++++++++++++ 4 files changed, 23 insertions(+) create mode 100644 tests/cts/hostside/certs/README create mode 100644 tests/cts/hostside/certs/cts-net-app.pk8 create mode 100644 tests/cts/hostside/certs/cts-net-app.x509.pem diff --git a/tests/cts/hostside/app2/Android.mk b/tests/cts/hostside/app2/Android.mk index 9a4a30fbff..5c0bae194b 100644 --- a/tests/cts/hostside/app2/Android.mk +++ b/tests/cts/hostside/app2/Android.mk @@ -32,4 +32,6 @@ LOCAL_DEX_PREOPT := false # Tag this module as a cts test artifact LOCAL_COMPATIBILITY_SUITE := cts vts general-tests +LOCAL_CERTIFICATE := cts/hostsidetests/net/certs/cts-net-app + include $(BUILD_CTS_SUPPORT_PACKAGE) diff --git a/tests/cts/hostside/certs/README b/tests/cts/hostside/certs/README new file mode 100644 index 0000000000..b660a82dc8 --- /dev/null +++ b/tests/cts/hostside/certs/README @@ -0,0 +1,2 @@ +# Generated with: +development/tools/make_key cts-net-app '/CN=cts-net-app' diff --git a/tests/cts/hostside/certs/cts-net-app.pk8 b/tests/cts/hostside/certs/cts-net-app.pk8 new file mode 100644 index 0000000000000000000000000000000000000000..1703e4ee340b7c7ab818097cefbbf95fb86f3747 GIT binary patch literal 1219 zcmV;!1U&mNf&{+;0RS)!1_>&LNQUrsW5^Br2+u}0)hbn0N#A&vRMl( z)K7&#gN-YqA(ePu&=E2o$Vjep&N^#?J+IQe_UD^8vWC4%PBxI-ME{s%p~72w0ZU@; zaXKTG43uCz5lGMl@ha*FIBFHPR{XV|cKf1`B_%f8?!Ujr zt-{>0C4_u?`%vIYq{z#o&|wc%#UbbC#EF~*3eXtI#Pu@b#2AEmesXH!;BA|+2B81W z!Zu8OMUNETxR$5$c?)i;hZYR4J*6YT$pCc&@}h3pQGsU#%?m@^a{>ba009Dm0RaHk zc>v0s8?m!kl+%O!>N@ze<-9;f(^2U#XFDru6^Rdi7GW7mTF+$(jvu=f&c6qwe0xQc z-YV8)osrJ&&LK`cr5XVSk|=+5h9S}kmdcGs++ig(JtFrKB&6at^XSEN7gbjf(l>>Q zW5q!7d>b5VnALd8DRw?XvqUfpAAaDQ)mpy#BAh*U&nzY5KA?dt?&F!_gTW_hO&aG? zFz!^L2yHTF#V@X&LqF|!Q4`{WkX^!rOP6AzE3-+ExKAD|AnK7^^w$v-bH;VQMuXQG z^wqpIj+;*3h|p36xkZ4_k2@ee;ehD~XA7iWt0O?}W4hlp!7008eHpZ&=5xtRJbcFmSVJik5H=O_+OcDr64K?)M2Tx(p#1Bj!W}szK*F#xG5_9njbtuN zvAj31ay#p;XUyF~^2T$(v1bpJYKX(0Hjh1=a0St$<@BH?5pD>(7CE0M%ug3w#-4iu zfq)5bl2l+u5>xWKztT8zHPHfrfdIA^X{1GXSD$}V6aG5WdD+aZ)3UOU)PA-Q{> z3qB8AR`51~p;B8g;f0T+gwBF{nn#RZ*xS3do08bdRK^ktwT+BuQ7nn@r4GbJz7x8u zX+HvifdH9pz)+xQ>TMce;8KGy?O90aj>ISS3b7$HM<}?=R_^2Dov>KX=fW4gZ0oL# z4TlXtL8u4+=w-H(!dkS=iZ?}Kj79RMiGFcJL@(@4Kz{D4>0IF9=(5M)>0ajZaHD0q hCv|>6qS`CJYwg-kjl|iF9l$*x