Don't duplicate test server arguments in Android test setup.

Don't duplicate test server arguments in Android test setup.

Most arguments can be passed as-is and the format is self-desribing. Avoid
having to update yet another file to plumb in a new argument.

This fixes --enable-npn, --ssl-key-exchange, and a handful of other SSL
arguments that were since added.

BUG=354132, 365733
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=265359

[davidben, 2014-04-17 22:06:03]

pliard: PTAL
rsleevi: mostly FYI

[davidben, 2014-04-18 15:27:22]

+bulach. It seems pliard is OOO.

[davidben, 2014-04-21 16:14:15]

Friendly ping. (This is blocking https://codereview.chromium.org/214593009/ from
landing.)

[bulach, 2014-04-22 09:09:48]

lgtm, thanks! (and sorry for the delay, was public holidays in UK).

https://codereview.chromium.org/241423003/diff/1/build/android/pylib/chrome_t...
File build/android/pylib/chrome_test_server_spawner.py (left):

https://codereview.chromium.org/241423003/diff/1/build/android/pylib/chrome_t...
build/android/pylib/chrome_test_server_spawner.py:204: if
self.arguments.has_key('cert-and-key-file'):
nit: just want to point out: these arguments would previously only be added if
it had --https, with the new implementation they'd always be included. I think
this won't be problem :) but just wanted to highlight..

https://codereview.chromium.org/241423003/diff/1/build/android/pylib/chrome_t...
File build/android/pylib/chrome_test_server_spawner.py (right):

https://codereview.chromium.org/241423003/diff/1/build/android/pylib/chrome_t...
build/android/pylib/chrome_test_server_spawner.py:208: if value is None:
nit: no need for "is None":
if value:
  self.command_line.append('--%s=%s' % (key, value))
else:
  self.command_line.append('--%s' % key)

[davidben, 2014-04-22 16:23:12]

Updated for more path munging since I missed that earlier. (Though given that
try bots worked in the previous run, I wonder if it's even necessary...)

https://codereview.chromium.org/241423003/diff/1/build/android/pylib/chrome_t...
File build/android/pylib/chrome_test_server_spawner.py (left):

https://codereview.chromium.org/241423003/diff/1/build/android/pylib/chrome_t...
build/android/pylib/chrome_test_server_spawner.py:204: if
self.arguments.has_key('cert-and-key-file'):
On 2014/04/22 09:09:48, bulach wrote:
> nit: just want to point out: these arguments would previously only be added if
> it had --https, with the new implementation they'd always be included. I think
> this won't be problem :) but just wanted to highlight..

The C++ side contains that logic anyway. It shouldn't be a problem. :-)

Though, I did notice that I missed some of the other filename munging, so I've
updated that. The missing data-dir case is no longer handled, but
BaseTestServer::GenerateArguments always includes it anyway.

https://codereview.chromium.org/241423003/diff/1/build/android/pylib/chrome_t...
File build/android/pylib/chrome_test_server_spawner.py (right):

https://codereview.chromium.org/241423003/diff/1/build/android/pylib/chrome_t...
build/android/pylib/chrome_test_server_spawner.py:208: if value is None:
On 2014/04/22 09:09:48, bulach wrote:
> nit: no need for "is None":
> if value:
>   self.command_line.append('--%s=%s' % (key, value))
> else:
>   self.command_line.append('--%s' % key)

That would probably cause troubles if value is 0.

[davidben, 2014-04-22 17:50:12]

The CQ bit was checked by davidben@chromium.org

[commit-bot: I haz the power, 2014-04-22 17:50:26]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/davidben@chromium.org/241423003/20001

[commit-bot: I haz the power, 2014-04-22 21:03:23]

Change committed as 265359