FIX for 'Modify expected listeners for ARC++'
Patch was submitted despite CQ failure. Submitting fix for the
HWTest (adb is running test machines and should be whitelisted)
When the container is present sslh replaces sshd on port 22
to mux between adb and sshd. sshd listens on port 2222 instead and
adb listens on localhost:5037
Test also no longer expects x11vnc, it has been removed (freon)
BUG=chromium:620781
TEST=security_NetworkListeners goes from failing to passing
on cyan and cyan-cheets
Change-Id: I0259cb273a4803a5cebbd6050899372dc8a607d4
Reviewed-on: https://chromium-review.googlesource.com/354510
Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
Trybot-Ready: Vincent Palatin <vpalatin@chromium.org>
Commit-Queue: Vincent Palatin <vpalatin@chromium.org>
Tested-by: Vincent Palatin <vpalatin@chromium.org>
Reviewed-by: Stefan Reinauer <reinauer@chromium.org>
diff --git a/client/site_tests/security_NetworkListeners/baseline.arc b/client/site_tests/security_NetworkListeners/baseline.arc
index ea168e3..017e2bf 100644
--- a/client/site_tests/security_NetworkListeners/baseline.arc
+++ b/client/site_tests/security_NetworkListeners/baseline.arc
@@ -5,6 +5,7 @@
# On ARC++ sshl-fork listens on port 22 and selects between adb and
# sshd
sshd *:2222
+adb 127.0.0.1:5037
sslh-fork *:ssh
# Shill internal http proxy. crosbug.com/28235
shill 127.0.0.1:DYNAMIC