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:51:14 +0000 (15:51 -0700)
commitc8dc7b460553fbe1255533f9492fcebf7f405693
tree88d2c375a5c29f52bb2b2516023e6e491d48756c
parente2711da9ebfc7c0dfca2779823cc211cc3ebe506
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