tests: Tolerate init process pid != 1.
authorJames Page <james.page@ubuntu.com>
Thu, 20 Jun 2013 21:31:52 +0000 (22:31 +0100)
committerBen Pfaff <blp@nicira.com>
Thu, 20 Jun 2013 22:52:03 +0000 (15:52 -0700)
commitc75310c38d6f6d362fa205f8661d2ee23c91c0ed
tree63e48900d6189b8debb1f7259408feb2a1b95724
parent43622c535f33a65f227295b600ef3229461e28d0
tests: Tolerate init process pid != 1.

On Ubuntu Saucy based desktops, upstart runs with user sessions
enabled which means that the init process under which a daemon
might run is not always pid = 1.

Instead of checking for pid = 1, check to ensure that the parent
pid of the monitor is not the pid of the shell that started it.

Signed-off-by: James Page <james.page@ubuntu.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
tests/daemon-py.at
tests/daemon.at