Launch X server from upstart. New factory UI. Misc script tweaks.

This goes together with:

http://codereview.chromium.org/1810006/show

BUG=none
TEST=none

[Tammo Spalink, 2010-05-04 10:26:55]

How do I get this script into /sbin/ ?

[Tom Wai-Hong Tam, 2010-05-05 08:03:10]

Till we move the mod_for_factory_scripts to ebuild, one way now is to create a
script in mod_for_factory_scripts to copy it to /sbin/.

http://codereview.chromium.org/1937002/diff/1/3
File src/scripts/mod_for_factory_scripts/200patchInitScript (right):

http://codereview.chromium.org/1937002/diff/1/3#newcode52
src/scripts/mod_for_factory_scripts/200patchInitScript:52:
XAUTHORITY=/var/run/factory_ui.auth; export XAUTHORITY
export DISPLAY=:0.0
export XAUTHORITY=/var/run/factory_ui.auth

[Nick Sanders, 2010-05-05 08:33:18]

I've just got the factory installer overlay ebuild working now.
Otherwise you can copy it or cat it to a file in mode_for_factory_scripts

On Wed, May 5, 2010 at 1:03 AM, <waihong@chromium.org> wrote:

> Till we move the mod_for_factory_scripts to ebuild, one way now is to
> create a
> script in mod_for_factory_scripts to copy it to /sbin/.
>
>
> http://codereview.chromium.org/1937002/diff/1/3
> File src/scripts/mod_for_factory_scripts/200patchInitScript (right):
>
> http://codereview.chromium.org/1937002/diff/1/3#newcode52
> src/scripts/mod_for_factory_scripts/200patchInitScript:52:
>
> XAUTHORITY=/var/run/factory_ui.auth; export XAUTHORITY
> export DISPLAY=:0.0
> export XAUTHORITY=/var/run/factory_ui.auth
>
>
> http://codereview.chromium.org/1937002/show
>

[kmixter1, 2010-05-06 17:01:53]

LGTM

[Tammo Spalink, 2010-05-20 06:38:59]

Can someone take another quick look?

[Tom Wai-Hong Tam, 2010-05-22 01:30:05]

http://codereview.chromium.org/1937002/diff/12001/13004
File src/scripts/mod_for_factory_scripts/factory_ui (right):

http://codereview.chromium.org/1937002/diff/12001/13004#newcode246
src/scripts/mod_for_factory_scripts/factory_ui:246: test_list = control_recv()
Better to add some comments on what the sequence of communication with
control.ui. Also add them to control.ui.

http://codereview.chromium.org/1937002/diff/12001/13004#newcode265
src/scripts/mod_for_factory_scripts/factory_ui:265: test_counters =
dict((test.formal_name, 0) for test in test_list)
Why don't you make counter as a data attribute of the class of test_data? It can
reduce some code complexity.

[Tammo Spalink, 2010-05-24 02:24:27]

http://codereview.chromium.org/1937002/diff/12001/13004
File src/scripts/mod_for_factory_scripts/factory_ui (right):

http://codereview.chromium.org/1937002/diff/12001/13004#newcode246
src/scripts/mod_for_factory_scripts/factory_ui:246: test_list = control_recv()
On 2010/05/22 01:30:05, Tom Wai-Hong Tam wrote:
> Better to add some comments on what the sequence of communication with
> control.ui. Also add them to control.ui.

Done.

http://codereview.chromium.org/1937002/diff/12001/13004#newcode265
src/scripts/mod_for_factory_scripts/factory_ui:265: test_counters =
dict((test.formal_name, 0) for test in test_list)
On 2010/05/22 01:30:05, Tom Wai-Hong Tam wrote:
> Why don't you make counter as a data attribute of the class of test_data? It
can
> reduce some code complexity.

Actually, this info cannot be test_data specific, since test_data instances can
share formal test names, and without also sharing counter information, this will
result in collisions.

[Tammo Spalink, 2010-05-24 02:41:24]

It would be oh so wonderful if we could switch to using gerrit which is just so
much better than this dreadful reitveld...

[Tom Wai-Hong Tam, 2010-05-24 09:44:53]

http://codereview.chromium.org/1937002/diff/23001/24001
File src/scripts/mod_for_factory_scripts/200patchInitScript (right):

http://codereview.chromium.org/1937002/diff/23001/24001#newcode79
src/scripts/mod_for_factory_scripts/200patchInitScript:79: diff --git
a/src/platform/init/software-update.conf
b/src/platform/init/software-update.conf
The software-update.conf is in /etc/init on the real image tree.

http://codereview.chromium.org/1937002/diff/23001/24002
File src/scripts/mod_for_factory_scripts/400configAutotest (right):

http://codereview.chromium.org/1937002/diff/23001/24002#newcode9
src/scripts/mod_for_factory_scripts/400configAutotest:9:
GLOBAL_CONFIG="${STATEFUL_DIR}/home/autotest-client/global_config.ini"
Maybe a merge mistake. Keep this original:
GLOBAL_CONFIG="${ROOT_FS_DIR}/usr/local/autotest/global_config.ini"

http://codereview.chromium.org/1937002/diff/23001/24002#newcode16
src/scripts/mod_for_factory_scripts/400configAutotest:16: cp "factory_ui"
"${STATEFUL_DIR}/home/autotest-client/"
The autotest directory should be "${ROOT_FS_DIR}/usr/local/autotest/".

http://codereview.chromium.org/1937002/diff/23001/24002#newcode17
src/scripts/mod_for_factory_scripts/400configAutotest:17: cp "factory_startx.sh"
"${STATEFUL_DIR}/home/autotest-client/"
The autotest directory should be "${ROOT_FS_DIR}/usr/local/autotest/".

[Tom Wai-Hong Tam, 2010-05-25 03:43:46]

I run it successfully in the ZGA board after some fixes.

http://codereview.chromium.org/1937002/diff/23001/24001
File src/scripts/mod_for_factory_scripts/200patchInitScript (right):

http://codereview.chromium.org/1937002/diff/23001/24001#newcode52
src/scripts/mod_for_factory_scripts/200patchInitScript:52: eval
`./factory_startx.sh`
The output of factory_startx.sh will go into factory.conf. Change it to:
eval \$(./factory_startx.sh)

http://codereview.chromium.org/1937002/diff/23001/24001#newcode56
src/scripts/mod_for_factory_scripts/200patchInitScript:56: cp -f
site_tests/suite_Factory/control.ui control
I suggest to keep the old control.full until the control.ui includes all the
functionality of control.full, like functional test, run-in test.

http://codereview.chromium.org/1937002/diff/23001/24002
File src/scripts/mod_for_factory_scripts/400configAutotest (right):

http://codereview.chromium.org/1937002/diff/23001/24002#newcode16
src/scripts/mod_for_factory_scripts/400configAutotest:16: cp "factory_ui"
"${STATEFUL_DIR}/home/autotest-client/"
Make this file executable. Otherwise, it causes an error.

http://codereview.chromium.org/1937002/diff/23001/24002#newcode17
src/scripts/mod_for_factory_scripts/400configAutotest:17: cp "factory_startx.sh"
"${STATEFUL_DIR}/home/autotest-client/"
Make this file executable. Otherwise, it causes an error.

[Tammo Spalink, 2010-05-26 06:51:34]

http://codereview.chromium.org/1937002/diff/23001/24001
File src/scripts/mod_for_factory_scripts/200patchInitScript (right):

http://codereview.chromium.org/1937002/diff/23001/24001#newcode52
src/scripts/mod_for_factory_scripts/200patchInitScript:52: eval
`./factory_startx.sh`
On 2010/05/25 03:43:46, Tom Wai-Hong Tam wrote:
> The output of factory_startx.sh will go into factory.conf. Change it to:
> eval \$(./factory_startx.sh)

Done.

http://codereview.chromium.org/1937002/diff/23001/24001#newcode56
src/scripts/mod_for_factory_scripts/200patchInitScript:56: cp -f
site_tests/suite_Factory/control.ui control
Plan is to add this functionality ... coming with a future patch set.

On 2010/05/25 03:43:46, Tom Wai-Hong Tam wrote:
> I suggest to keep the old control.full until the control.ui includes all the
> functionality of control.full, like functional test, run-in test.

http://codereview.chromium.org/1937002/diff/23001/24001#newcode79
src/scripts/mod_for_factory_scripts/200patchInitScript:79: diff --git
a/src/platform/init/software-update.conf
b/src/platform/init/software-update.conf
On 2010/05/24 09:44:53, Tom Wai-Hong Tam wrote:
> The software-update.conf is in /etc/init on the real image tree.

Done.

http://codereview.chromium.org/1937002/diff/23001/24002
File src/scripts/mod_for_factory_scripts/400configAutotest (right):

http://codereview.chromium.org/1937002/diff/23001/24002#newcode9
src/scripts/mod_for_factory_scripts/400configAutotest:9:
GLOBAL_CONFIG="${STATEFUL_DIR}/home/autotest-client/global_config.ini"
On 2010/05/24 09:44:53, Tom Wai-Hong Tam wrote:
> Maybe a merge mistake. Keep this original:
> GLOBAL_CONFIG="${ROOT_FS_DIR}/usr/local/autotest/global_config.ini"

Done.

http://codereview.chromium.org/1937002/diff/23001/24002#newcode16
src/scripts/mod_for_factory_scripts/400configAutotest:16: cp "factory_ui"
"${STATEFUL_DIR}/home/autotest-client/"
On 2010/05/24 09:44:53, Tom Wai-Hong Tam wrote:
> The autotest directory should be "${ROOT_FS_DIR}/usr/local/autotest/".

Done.

http://codereview.chromium.org/1937002/diff/23001/24002#newcode16
src/scripts/mod_for_factory_scripts/400configAutotest:16: cp "factory_ui"
"${STATEFUL_DIR}/home/autotest-client/"
On 2010/05/25 03:43:46, Tom Wai-Hong Tam wrote:
> Make this file executable. Otherwise, it causes an error.

Done.

http://codereview.chromium.org/1937002/diff/23001/24002#newcode17
src/scripts/mod_for_factory_scripts/400configAutotest:17: cp "factory_startx.sh"
"${STATEFUL_DIR}/home/autotest-client/"
On 2010/05/24 09:44:53, Tom Wai-Hong Tam wrote:
> The autotest directory should be "${ROOT_FS_DIR}/usr/local/autotest/".

Done.

http://codereview.chromium.org/1937002/diff/23001/24002#newcode17
src/scripts/mod_for_factory_scripts/400configAutotest:17: cp "factory_startx.sh"
"${STATEFUL_DIR}/home/autotest-client/"
On 2010/05/25 03:43:46, Tom Wai-Hong Tam wrote:
> Make this file executable. Otherwise, it causes an error.

Done.

[Tom Wai-Hong Tam, 2010-05-26 08:02:19]

LGTM