summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-09-24Snap for 6862191 from 0b69217c71fdb04e6e2dea74443ebe3e4391104a to ↵android-11.0.0_r31android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid-build-team Robot
rvc-qpr1-release Change-Id: I6bb9ee23cced7778fa022ad585c51443a12f9601
2020-09-23[automerger skipped] Merge "Use blocking sockets with timeout for ↵android-11.0.0_r46android-11.0.0_r43android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r30android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-c-releaseTreehugger Robot
xfrm_tunnel_test" into pie-vts-dev am: 092e8067d4 am: 05ad5dcbce -s ours am: 9334bb1f2e -s ours am: b742e21dc4 -s ours am: 2bfdc7d34f -s ours am: 4ffa864ffd -s ours am skip reason: Change-Id I92a39f8890244ebe918f48bcf0971e85795b2a1e with SHA-1 a563236b85 is in history Original change: https://android-review.googlesource.com/c/kernel/tests/+/1258077 Change-Id: I0b08a4f986f5a323f562a352795c7e0902bb2772
2020-09-23[automerger skipped] Merge "Use blocking sockets with timeout for ↵Treehugger Robot
xfrm_tunnel_test" into pie-vts-dev am: 092e8067d4 am: 05ad5dcbce -s ours am: 9334bb1f2e -s ours am: b742e21dc4 -s ours am: 2bfdc7d34f -s ours am skip reason: Change-Id I92a39f8890244ebe918f48bcf0971e85795b2a1e with SHA-1 a563236b85 is in history Original change: https://android-review.googlesource.com/c/kernel/tests/+/1258077 Change-Id: I9fd67ff0272b078e2ab56468c850298c85386f40
2020-09-23[automerger skipped] Merge "Use blocking sockets with timeout for ↵Treehugger Robot
xfrm_tunnel_test" into pie-vts-dev am: 092e8067d4 am: 05ad5dcbce -s ours am: 9334bb1f2e -s ours am: b742e21dc4 -s ours am skip reason: Change-Id I92a39f8890244ebe918f48bcf0971e85795b2a1e with SHA-1 a563236b85 is in history Original change: https://android-review.googlesource.com/c/kernel/tests/+/1258077 Change-Id: I0841b8a6c0125a7976adb1b2eb89ff7776907503
2020-09-23[automerger skipped] Merge "Use blocking sockets with timeout for ↵Treehugger Robot
xfrm_tunnel_test" into pie-vts-dev am: 092e8067d4 am: 05ad5dcbce -s ours am: 9334bb1f2e -s ours am skip reason: Change-Id I92a39f8890244ebe918f48bcf0971e85795b2a1e with SHA-1 a563236b85 is in history Original change: https://android-review.googlesource.com/c/kernel/tests/+/1258077 Change-Id: I05bfa0ff95d1c8c8ce7814cdef2745d2997fded6
2020-09-23[automerger skipped] Merge "Use blocking sockets with timeout for ↵Treehugger Robot
xfrm_tunnel_test" into pie-vts-dev am: 092e8067d4 am: 05ad5dcbce -s ours am skip reason: Change-Id I92a39f8890244ebe918f48bcf0971e85795b2a1e with SHA-1 a563236b85 is in history Original change: https://android-review.googlesource.com/c/kernel/tests/+/1258077 Change-Id: If14bb6877f66ab89b75ddfba123eeb929a89924c
2020-09-23Merge "Use blocking sockets with timeout for xfrm_tunnel_test" into ↵Treehugger Robot
pie-vts-dev am: 092e8067d4 Original change: https://android-review.googlesource.com/c/kernel/tests/+/1258077 Change-Id: I0b990e432964a9ddcb783eb47fb2cc33abc4081a
2020-09-23Merge "Use blocking sockets with timeout for xfrm_tunnel_test" into pie-vts-devpie-vts-devTreehugger Robot
2020-09-23Use blocking sockets with timeout for xfrm_tunnel_testBenedict Wong
Using non-blocking sockets appears to be causing flakiness due to the tests racing against the kernel's crypto/networking infrastructure. This commit allows these sockets to block for up to 500ms to allow time for the crypto and routing to complete before throwing errors. Bug: 118753529 Test: Run 20x locally, via QEMU; passing. Change-Id: I92a39f8890244ebe918f48bcf0971e85795b2a1e Merged-In: I92a39f8890244ebe918f48bcf0971e85795b2a1e
2020-08-13Snap for 6761348 from b908fc16e4c05270bec817bc8673d71ff9b7f09e to ↵android-build-team Robot
rvc-qpr1-release Change-Id: I685369d5af8a856d402a3f35b7ae5f086d7d1f48
2020-08-13[automerger skipped] Fix ↵Elvis Chien
VtsKernelNetTest#VtsKernelNetTest#testKernelNetworking am: b3880b372f am: 19e285a4a8 am: e00eb472ec am: 54da35a63c -s ours am: 8cf79723c9 -s ours am: 086360c014 -s ours am skip reason: Change-Id I2fd94487db3412669ab8bb938010b00cbb54766d with SHA-1 afb2c04a5c is in history Original change: https://android-review.googlesource.com/c/kernel/tests/+/1387197 Change-Id: Ib7f0e1d5d99ec564e9542094702ea2531cfa1a4c
2020-08-13[automerger skipped] Fix ↵Elvis Chien
VtsKernelNetTest#VtsKernelNetTest#testKernelNetworking am: b3880b372f am: 19e285a4a8 am: e00eb472ec am: 54da35a63c -s ours am: 8cf79723c9 -s ours am skip reason: Change-Id I2fd94487db3412669ab8bb938010b00cbb54766d with SHA-1 afb2c04a5c is in history Original change: https://android-review.googlesource.com/c/kernel/tests/+/1387197 Change-Id: I4b4a989c3bc38e75b38b505134a2a0bc507d6c9a
2020-08-13[automerger skipped] Fix ↵Elvis Chien
VtsKernelNetTest#VtsKernelNetTest#testKernelNetworking am: b3880b372f am: 19e285a4a8 am: e00eb472ec am: 54da35a63c -s ours am skip reason: Change-Id I2fd94487db3412669ab8bb938010b00cbb54766d with SHA-1 afb2c04a5c is in history Original change: https://android-review.googlesource.com/c/kernel/tests/+/1387197 Change-Id: I150d03a9e5ad3801e1fdfa1a1ec9922836c7f53d
2020-08-13Fix VtsKernelNetTest#VtsKernelNetTest#testKernelNetworking am: b3880b372f ↵Elvis Chien
am: 19e285a4a8 am: e00eb472ec Original change: https://android-review.googlesource.com/c/kernel/tests/+/1387197 Change-Id: I8746869038f71d30963d62af5226ad62caef55aa
2020-08-13Fix VtsKernelNetTest#VtsKernelNetTest#testKernelNetworking am: b3880b372f ↵Elvis Chien
am: 19e285a4a8 Original change: https://android-review.googlesource.com/c/kernel/tests/+/1387197 Change-Id: I876797d7b9a4b68becaa1735e3f14d023ad3f0c9
2020-08-13Fix VtsKernelNetTest#VtsKernelNetTest#testKernelNetworking am: b3880b372fElvis Chien
Original change: https://android-review.googlesource.com/c/kernel/tests/+/1387197 Change-Id: Ibc58ef660a7cf1a193fbce5c36e3e0192502576a
2020-08-04Fix VtsKernelNetTest#VtsKernelNetTest#testKernelNetworkingElvis Chien
Bug: 140366925 Change-Id: I2fd94487db3412669ab8bb938010b00cbb54766d Merged-In: I2fd94487db3412669ab8bb938010b00cbb54766d (cherry picked from commit d8385e2e7f732a73e9fe9130d3a974d1254681d1)
2020-05-27net-test: attempt to use namespaces on devices with ADB/TCP am: a1197aaead ↵Maciej Żenczykowski
am: 0e828863e1 Change-Id: I4dea3abc058ed7cebf6d4436bb113aa1d37dbbc9
2020-05-27net-test: attempt to use namespaces on devices with ADB/TCP am: a1197aaeadMaciej Żenczykowski
Change-Id: Icd83e9af9cd2840b3d562abb0566fd4e73b89555
2020-05-27net-test: prefix %x with 0x am: 4ce0aed14c am: 0157919b23Maciej Żenczykowski
Change-Id: If5efd02d353934353810013e7c3110c5032f431a
2020-05-27net-test: prefix %x with 0x am: 4ce0aed14cMaciej Żenczykowski
Change-Id: I997da6691d8c8f5cfe48ae43076f8a5b6ff315c8
2020-05-27net-test: attempt to use namespaces on devices with ADB/TCPandroid-cts-11.0_r2Maciej Żenczykowski
I'm not really sure if a test for tcp/5555 being occupied is a good test or not as a means of detecting ADB over TCP... (because what guarantees it's port 5555...) 4.14-based RVC phone (via USB): $ adb shell lsof | egrep ^adbd | egrep IP adbd 1372 root 8u IPv6 0t0 37835 TCP []:5037->[]:0 (LISTEN) 5.4 RVC cuttlefish device (via vsock:4:5555): $ adb shell lsof | egrep ^adbd | egrep IP adbd 410 root 11u IPv6 0t0 10914 TCP []:5555->[]:0 (LISTEN) Bug: 149894399 Test: a_test vts_kernel_net_tests (on rvc cuttlefish x86_64) Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I76bba37498ceccc48eb724f5357ec14eed84ae48 Merged-In: I76bba37498ceccc48eb724f5357ec14eed84ae48
2020-05-27net-test: prefix %x with 0xMaciej Żenczykowski
Fix for: Creating clean namespace... failed: [Errno 22] Invalid argument while unshare(44020000) (likely: no privs or lack of kernel support). Bug: 149894399 Test: ran 'atest vts_kernel_net_tests' Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I6364cbba4d210423749107b5a2edff1de43caf15 Merged-In: I6364cbba4d210423749107b5a2edff1de43caf15
2020-05-26net-test: do not allow propagation of mount flags to parent namespace am: ↵Maciej Żenczykowski
8729a90040 am: 43d6295075 Change-Id: Ic1809ff6e71f7f341caa7860eb3b48405c347116
2020-05-26net-test: SetHostName -> SetHostname am: 14a5302274 am: fdafcd4e9dMaciej Żenczykowski
Change-Id: I79225acea8ef8fc950f162d6d9f736ddec4f4b4f
2020-05-26net-test: do not allow propagation of mount flags to parent namespace am: ↵Maciej Żenczykowski
8729a90040 Change-Id: I510e3c8e95c3b7f06a758afde0d0a768f6225217
2020-05-26net-test: SetHostName -> SetHostname am: 14a5302274Maciej Żenczykowski
Change-Id: I24b979533ecb6f4673ec6ed1ee3b870df4a77cfe
2020-05-26net-test: do not allow propagation of mount flags to parent namespaceMaciej Żenczykowski
on a cuttlefish x86_64 aosp3 device without this change: $ adbz shell cat /proc/mounts | egrep ' /(|proc|sys) ' /dev/block/dm-2 / ext4 ro,seclabel,noatime,errors=panic 0 0 proc /proc proc rw,relatime,gid=3009,hidepid=2 0 0 sysfs /sys sysfs rw,seclabel,relatime 0 0 $ atest vts_kernel_net_tests ... $ adbz shell cat /proc/mounts | egrep ' /(|proc|sys) ' /dev/block/dm-2 / ext4 ro,seclabel,noatime,errors=panic 0 0 proc /proc proc rw,nosuid,nodev,noexec,relatime,gid=3009,hidepid=2 0 0 sysfs /sys sysfs rw,seclabel,nosuid,nodev,noexec,relatime 0 0 with this change there is no longer a difference. (This explains why I saw this mount syscall while strace'ing unshare) Bug: 149894399 Test: ran 'atest vts_kernel_net_tests' Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: Ia64be091b58f97fdf7e0c24ca6599b1aecd3bcdf Merged-In: Ia64be091b58f97fdf7e0c24ca6599b1aecd3bcdf
2020-05-26net-test: SetHostName -> SetHostnameMaciej Żenczykowski
Bug: 149894399 Test: trivial Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I4c2f7ee7e095fbbe7d135fc2af560c3e0626b309 Merged-In: I4c2f7ee7e095fbbe7d135fc2af560c3e0626b309
2020-05-16net-test: namespace support lib - use 'lazy' umount am: f3a01a9c9f am: ↵Maciej Żenczykowski
1e25f89c47 Change-Id: Ia602c358c39682cfe200a9471fffa0a022a8da86
2020-05-16net-test: namespace support lib - use 'lazy' umount am: f3a01a9c9fMaciej Żenczykowski
Change-Id: I5da043d9c0c8a04718cc7634b1a075ab2a12b846
2020-05-16net-test: namespace support lib - use 'lazy' umountMaciej Żenczykowski
This makes umount succeed even if stuff is mounted below the mount point. vm:~# unshare -u -m -n -- bash -c 'umount -l /proc; mount -t proc proc /proc; umount -l /sys; mount -t sysfs sys /sys; egrep " /(proc|sys)" < /proc/mounts' proc /proc proc rw 0 0 sys /sys sysfs rw 0 0 which fails without the 2 -l's: [pid X] umount("/proc", 0) = -1 EBUSY (Device or resource busy) umount: /proc: target is busy (In some cases useful info about processes that use the device is found by lsof(8) or fuser(1).) [pid X] umount("/sys", 0) = -1 EBUSY (Device or resource busy) umount: /sys: target is busy (In some cases useful info about processes that use the device is found by lsof(8) or fuser(1).) due to (among other things): /proc/bus/usb and /sys/fs/bpf being mounted. Test: ran uml net tests against Android Common Kernel 4.14-stable ('r') Bug: 149894399 Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I4957722e109cfd55c8efa55ebd8f718bd049a811 Merged-In: I4957722e109cfd55c8efa55ebd8f718bd049a811
2020-05-14net-test: namespace support library am: 7c5e486669 am: 4a264117aeMaciej Żenczykowski
Change-Id: I4c0afa37b2c8d3d1246017edbf5d8e6f9b96c657
2020-05-14net-test: namespace support library am: 7c5e486669Maciej Żenczykowski
Change-Id: I6997803bc5f0b2dc18b6a505b2cd8420eae974bf
2020-05-14net-test: namespace support libraryMaciej Żenczykowski
Bug: 149894399 Test: ran uml net_tests against Android Kernel Common 5.4 Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: Iecbe71b61138e795783a7fa9b39588473a51c048 Merged-In: Iecbe71b61138e795783a7fa9b39588473a51c048
2020-05-11net-test: truly wide open ping_group_range am: 30e280fa95 am: 409ca90602Maciej Żenczykowski
Change-Id: I3003ae0bcec43c74a95ed0886cd0596554a0300c
2020-05-11net-test: all_tests.py - fix a lint warning am: 461542279e am: 8cc7ff84d9Maciej Żenczykowski
Change-Id: I323949a4dbc462d3b4f05baa53a5ba1a1981a819
2020-05-11net-test: all_tests.py - consistent use of single quotes am: 732cf15b21 am: ↵Maciej Żenczykowski
98cfbc13e1 Change-Id: I1b9d680707831d1688fe52b8799f2f7a7a941386
2020-05-11Add METADATA to tests: Apache2+OpenSSL=NOTICE am: ebf68291cb am: 643879311eBob Badour
Change-Id: Ie44452dfe49bfa231ab74494744a458607afd336
2020-05-11net-test: truly wide open ping_group_range am: 30e280fa95Maciej Żenczykowski
Change-Id: I4f002c99fdd428e96fe807b2c340ded7219e2a41
2020-05-11net-test: all_tests.py - fix a lint warning am: 461542279eMaciej Żenczykowski
Change-Id: Ie22143a8a09020dc3699675639f4e8d9db8e51ea
2020-05-11net-test: all_tests.py - consistent use of single quotes am: 732cf15b21Maciej Żenczykowski
Change-Id: I2a9aa87b9c5b3adf7a5f6e966530be23473fb845
2020-05-11Add METADATA to tests: Apache2+OpenSSL=NOTICE am: ebf68291cbBob Badour
Change-Id: I420faee5652f10808a9e84c0fdd7becd6e0b70e4
2020-05-11net-test: truly wide open ping_group_rangeMaciej Żenczykowski
There is simply no good reason to use 65536, since it doesn't fit in 16 bits anyway. Use the maximum supported value instead. This matches what we use on Android itself. Bug: 149894399 Test: ran uml net_tests against Android Kernel Common 5.4 Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I4346304180c4dbf803241b7d1732ef4e2b576be8 Merged-In: I4346304180c4dbf803241b7d1732ef4e2b576be8
2020-05-11net-test: all_tests.py - fix a lint warningMaciej Żenczykowski
Fixes: Forcing safe mode "style". ************* File all_tests.py C6202: 17: Importing a member of a module [g-importing-member] http://go/gpylint-faq#g-importing-member Bug: 153035880 Test: ran uml net_tests against Android Kernel Common 4.19 Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I924e58fd5c5c4ce380c9d40d6cabe8766491313e Merged-In: I924e58fd5c5c4ce380c9d40d6cabe8766491313e
2020-05-11net-test: all_tests.py - consistent use of single quotesMaciej Żenczykowski
(fixes an inconsistent string delimiter lint warning) Bug: 153035880 Test: ran uml net_tests against Android Kernel Common 5.4 Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: Iaef8c25bfd220eca0b756ea6ec28e8ddaba993e2 Merged-In: Iaef8c25bfd220eca0b756ea6ec28e8ddaba993e2
2020-05-11Add METADATA to tests: Apache2+OpenSSL=NOTICEBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: I57044b5725b9b55be16ac28ff4ed249a0eda2ba1 Merged-In: I57044b5725b9b55be16ac28ff4ed249a0eda2ba1
2020-05-10Merge "Fix srcaddr_selection_test when forwarding is on." into rvc-dev am: ↵Lorenzo Colitti
1998f83dff am: fd2a51104e Change-Id: Ie5f1158e0997ba67e569d4c97f9431d72f1deea3
2020-05-10Merge "Support running only one test." into rvc-dev am: 2369fc3481 am: ↵Lorenzo Colitti
90fc027bc6 Change-Id: I563004cf124fd6ef5149449e931a85225c33e20e
2020-05-10Fix run_net_test.sh --norun. am: 031757712c am: 6b16b073afLorenzo Colitti
Change-Id: I2367dc3aab7b2ed52aee99301a3f282164ec871f