Merge lp:~canonical-platform-qa/ubuntu-ota-tests/upgrade into lp:ubuntu-ota-tests

[Leo Arias]

Flash with:
ubuntu-device-flash --revision=-1 touch --developer-mode --password 0000 --channel="ubuntu-touch/devel-proposed" --wipe

The adb-reboot-to-recovery script is copied from /usr/share/autopkgtest/ssh-setup/adb, which only one line changed:

261 + adb $ADBOPTS reboot recovery

[Leo Arias (elopio)]

To give it a try, use something like:

elopio@tangamandapio76-desktop:~/workspace/canonical/ubuntu-ota-tests/experimeal/upgrade$ phablet-network
elopio@tangamandapio76-desktop:~/workspace/canonical/ubuntu-ota-tests/experimental/upgrade$ adt-run -d -B --unbuilt-tree=/home/elopio/workspace/canonical/ubuntu-ota-tests/experimental/upgrade --output-dir /tmp/output --- ssh -s /home/elopio/workspace/canonical/ubuntu-ota-tests/experimental/upgrade/adb-reboot-to-recovery

[Leo Arias (elopio)]

After the reboot, I got:
adt-virt-ssh: WARNING: ssh connection failed. Retrying in 3 seconds...

If I phablet-shell in a different terminal, the test continues.
So we are missing a way to reset the ssh connection.

[Leo Arias (elopio)]

This makes it work, but I'm not quite sure if it is right.

=== modified file 'adb-reboot-to-recovery'
--- adb-reboot-to-recovery 2015-03-03 19:28:44 +0000
+++ adb-reboot-to-recovery 2015-03-03 20:10:08 +0000
@@ -256,7 +256,7 @@
     adb $ADBOPTS reboot recovery
     wait_booted
     adb $ADBOPTS forward tcp:$FWD_PORT tcp:22
- ubuntu_prepare_for_testing
+ open
 }

[Brendan Donegan (brendan-donegan)]

Do we definitely want to merge this? It doesn't implement what we want since we decided to use dbus to trigger the update, which we still need the scripts for, but I suppose it would be a good building block to start from. Any other opinions?

review: Needs Information

[Federico Gimenez (fgimenez)]

I'm getting this [1] at the end of the execution, otherwise seems to work fine

[1] http://paste.ubuntu.com/10526508/

[Leo Arias (elopio)]

No, please don't merge it. The system-image-cli it's easy to replace, but the adb-reboot-to-recovery is ugly. We need a better solution for that.

[Brendan Donegan (brendan-donegan)]

Ok, set to WIP to avoid confusion

[lp:~canonical-platform-qa/ubuntu-ota-tests/upgrade]

5. By Leo Arias on 2015-03-03

Do the reboot only if the download workded.

6. By Leo Arias on 2015-03-05

Added a dbus call to enable ssh.

[Leo Arias (elopio)]

There was no need to call open again.
We just need to renable ssh with a dbus call. I pushed this version.

263 + adb $ADBOPTS shell 'gdbus call -y -d com.canonical.PropertyService -o /com/canonical/PropertyService -m com.canonical.PropertyService.SetProperty ssh true >/dev/null'

[lp:~canonical-platform-qa/ubuntu-ota-tests/upgrade]

7. By Leo Arias on 2015-03-05

Merged with trunk.

8. By Leo Arias on 2015-03-09

Change cli to dbus.

[Leo Arias (elopio)]

In order to get the latest system-image-dbus version, run with:

adt-run -d -B --unbuilt-tree=. --output-dir /tmp/output --setup-commands "mount -o remount,rw /; apt-add-repository -y ppa:barry/systemimage; apt-get --no-list-cleanup update -o Dir::Etc::SourceList=/dev/null; sync; sleep 2; mount -o remount,ro /"--- ssh -s ./adb-reboot-to-recovery

[lp:~canonical-platform-qa/ubuntu-ota-tests/upgrade]

9. By Leo Arias on 2015-03-09

Quickly fixed the apply script.

10. By Leo Arias on 2015-03-09

Merged with prerequisite.

11. By Leo Arias on 2015-03-09

Merged with prerequisite. Changed the script to python.

12. By Leo Arias on 2015-03-09

Reduced the try.

13. By Leo Arias on 2015-03-09

fixtures not needed yet.

14. By Leo Arias on 2015-03-10

Merged with prerequisite.

15. By Leo Arias on 2015-03-10

Move the test to the ota module.

16. By Leo Arias on 2015-03-10

Merged with parent.

17. By Leo Arias on 2015-03-10

Use the command.

18. By Leo Arias on 2015-03-10

Added the missing file.

19. By Leo Arias on 2015-03-10

Fixed the import order.

20. By Leo Arias on 2015-03-10

Fixed the reboot call.

21. By Leo Arias on 2015-03-10

Use cli and the current version for now.

22. By Leo Arias on 2015-03-10

Removed the dbus upgrade, not yet working.

23. By Leo Arias on 2015-03-10

Downgrade to the released version.

24. By Leo Arias on 2015-03-11

Removed the rebooting.

25. By Leo Arias on 2015-03-12

Cleaned the code.

26. By Leo Arias on 2015-03-12

Merged with trunk.

Unmerged revisions

=== added file 'adb-reboot-to-recovery'
--- adb-reboot-to-recovery	1970-01-01 00:00:00 +0000
+++ adb-reboot-to-recovery	2015-03-09 21:35:41 +0000
@@ -0,0 +1,337 @@
+#!/bin/sh
+
+# adb.ssh is part of autopkgtest
+# autopkgtest is a tool for testing Debian binary packages
+#
+# This script sets up an ssh connection to an adb host. If that adb host is an
+# Ubuntu Touch system, it also does some extra configuration like disabling the
+# screen timeout and allowing Autopilot to introspect running apps.
+#
+# Options:
+# -r/--reset  Do a factory reset of the device before running the test
+#             (Available on Ubuntu Phone only; disabled for now as it does not
+#             re-enable developer mode)
+# -b/--reboot Reboot the device before running the test
+# -s serial | --serial=serial
+#             Serial  ID  of  the device as returned by adb devices -l when
+#             several devices are connected to the same host.
+# -p PASSWORD | --password PASSWORD
+#             sudo password; if not given, tries "phablet" and "0000"; if
+#             neither works, tests cannot run as root
+#
+# autopkgtest is Copyright (C) 2006-2014 Canonical Ltd.
+#
+# Author: Jean-Baptiste Lallement <[e-mail]>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#
+# See the file CREDITS for a full list of credits information (often
+# installed as /usr/share/doc/autopkgtest/CREDITS).
+set -e
+
+SSH_USER=phablet
+SUDO_PASSWORD=
+CAPABILITIES='isolation-machine reboot'
+
+# allow using lp:phablet-tools from a checkout
+if [ -n "$PHABLET_TOOLS_PATH" ]; then
+    export PATH="$PHABLET_TOOLS_PATH:$PATH"
+fi
+
+# argument parsing
+ADBOPTS=""
+RESET=""
+REBOOT=""
+IDENTITY=
+
+open() {
+    # Setup a connection to an adb device
+    # - Configure ssh connection
+    # - optionally mount device RW
+    wait_booted
+
+    if [ -n "$REBOOT" ]; then
+        adb $ADBOPTS reboot
+        wait_booted
+    fi
+
+    # special setup on Ubuntu images
+    if [ -n "$(adb $ADBOPTS shell 'type unity8 2>/dev/null')" ]; then
+        if [ -n "$RESET" ]; then
+            revert
+        else
+            ubuntu_prepare_config
+            ubuntu_prepare_for_testing
+        fi
+        #CAPABILITIES="$CAPABILITIES revert"
+    fi
+
+
+    # Configure SSH
+    adb $ADBOPTS shell 'gdbus call -y -d com.canonical.PropertyService -o /com/canonical/PropertyService -m com.canonical.PropertyService.SetProperty ssh true >/dev/null'
+    for port in `seq 2222 2299`; do
+        adb $ADBOPTS forward tcp:$port tcp:22 && break
+    done
+
+    # Purge the device host key so that SSH doesn't print a scary warning about it
+    # (it changes every time the device is reflashed and this is expected)
+    ssh-keygen -f ~/.ssh/known_hosts -R [localhost]:$PORT 2>/dev/null || true
+
+    # Copy your ssh id down to the device so you never need a password.
+    IDENTITY=$HOME/.ssh/id_rsa
+    if [ ! -e $IDENTITY ]; then
+        IDENTITY=$HOME/.ssh/id_autopkgtest
+        if [ ! -e $IDENTITY ]; then
+            echo "No default ssh key, generating $IDENTITY" >&2
+            ssh-keygen -q -t ed25519 -f $IDENTITY -N ''
+        fi
+    fi
+    script=$(mktemp /tmp/$(basename $0).XXXXXX)
+    adb $ADBOPTS push ${IDENTITY}.pub /home/$SSH_USER/.ssh/authorized_keys
+    cat>$script <<EOF
+# Set right permissions
+chown $SSH_USER:$SSH_USER -R /home/$SSH_USER/.ssh/
+chmod 700 /home/$SSH_USER/.ssh
+chmod 600 /home/$SSH_USER/.ssh/authorized_keys
+EOF
+
+    adb $ADBOPTS push $script /tmp
+    adb $ADBOPTS shell sh $script
+    adb $ADBOPTS shell rm $script
+    rm $script
+
+    # verify that we can connect through ssh
+    local ssh_cmd="ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i $IDENTITY -p $port -l $SSH_USER localhost"
+    for retry in `seq 10`; do
+        if $ssh_cmd true; then
+            can_ssh=1
+            break
+        fi
+        sleep 2
+    done
+    if [ -z "$can_ssh" ]; then
+        echo "ssh setup failed, cannot connect" >&2
+        exit 1
+    fi
+
+    # try to auto-detect sudo password from common ones used by CI
+    for p in phablet 0000; do
+        if $ssh_cmd "echo $p | sudo -S true" >/dev/null 2>&1; then
+            SUDO_PASSWORD="$p"
+            break
+        fi
+    done
+
+    # print info for adt-virt-ssh
+    cat<<EOF
+login=$SSH_USER
+hostname=localhost
+port=$port
+capabilities=$CAPABILITIES
+identity=$IDENTITY
+extraopts=--no-reset --fwd-port=$port
+EOF
+    if [ -n "$SUDO_PASSWORD" ]; then
+        echo "password=$SUDO_PASSWORD"
+    fi
+}
+
+wait_booted() {
+    echo "Waiting for device ADB to appear..." >&2
+    if ! timeout 300 adb $ADBOPTS wait-for-device >/dev/null; then
+        echo "ERROR: Timed out waiting for adb device" >&2
+    fi
+}
+
+# configure Ubuntu device for testing
+ubuntu_prepare_config() {
+    if [ -z "$(adb $ADBOPTS shell 'type unity8 2>/dev/null')" ]; then
+        # not an Ubuntu phone
+        return
+    fi
+
+    if ! type phablet-config >/dev/null 2>&1; then
+        echo "ERROR: phablet-config not found! Install phablet-tools package or" >&2
+        echo "bzr branch lp:phablet-tools and run with PHABLET_TOOLS_PATH=<checkout dir>" >&2
+        exit 1
+    fi
+
+    echo "Configuring Ubuntu phone for testing..." >&2
+
+    # disable first-time wizards; these fail due to adb instability from time
+    # to time, so retry
+    for retry in `seq 5`; do
+        if phablet-config $ADBOPTS welcome-wizard --disable >/dev/null; then
+            break
+        else
+            echo "Failed to disable welcome wizard, retrying (attempt $retry)..." >&2
+            sleep 1
+        fi
+    done
+    # this needs accounts-daemon running
+    adb $ADBOPTS shell 'while ! pidof accounts-daemon >/dev/null; do sleep 1; done'
+    for retry in `seq 5`; do
+        if phablet-config $ADBOPTS edges-intro --disable >/dev/null; then
+            break
+        else
+            echo "Failed to disable edges intro, retrying (attempt $retry)..." >&2
+            sleep 1
+        fi
+    done
+
+    # kill an already running welcome wizard
+    adb $ADBOPTS shell 'kill `pidof system-settings-wizard` 2>/dev/null'
+}
+
+# test run time setup for Ubuntu device
+ubuntu_prepare_for_testing() {
+    if [ -z "$(adb $ADBOPTS shell 'type unity8 2>/dev/null')" ]; then
+        # not an Ubuntu phone
+        return
+    fi
+
+    echo "Preparing Ubuntu phone for running tests..." >&2
+
+    echo "Waiting for desktop to boot" >&2
+    local timeout=$(($(date +%s) + 300))
+    while [ "$(date +%s)" -le $timeout ]; do
+        out=$(adb $ADBOPTS shell 'gdbus call --timeout 5 --session --dest com.canonical.UnityGreeter --object-path / --method org.freedesktop.DBus.Properties.Get com.canonical.UnityGreeter IsActive 2>/dev/null')
+        if [ -n "$out" ]; then
+            timeout=0
+            break
+        fi
+        sleep 5
+    done
+    if [ "$timeout" -gt 0 ]; then
+        echo "ERROR: timed out waiting for Unity greeter" >&2
+        exit 1
+    fi
+
+    # disable screen dimming; ugly, but pretty much everything else hangs forever
+    adb $ADBOPTS shell "setsid powerd-cli display </dev/null >/dev/null 2>&1 & disown;
+                        while ! pidof powerd-cli >/dev/null; do sleep 0.1; done"
+
+    # unlock the greeter
+    adb $ADBOPTS shell "gdbus call --session --dest com.canonical.UnityGreeter --object-path / --method com.canonical.UnityGreeter.HideGreeter && echo Greeter unlocked" >/dev/null
+}
+
+revert() {
+    # revert is only offered on Ubuntu images
+    echo "Performing factory reset, this will take a minute..." >&2
+
+    # save current network connections
+    NETCONF=$(phablet-config $ADBOPTS network --read) || true:
+
+    # do factory reset
+    adb $ADBOPTS shell 'gdbus call --system -d com.canonical.SystemImage -o /Service -m com.canonical.SystemImage.FactoryReset'
+    wait_booted
+    adb $ADBOPTS shell 'while ! pidof NetworkManager >/dev/null; do sleep 1; done'
+
+    # restore network connections
+    if [ -n "$NETCONF" ]; then
+        phablet-config $ADBOPTS network --write "$NETCONF"
+    fi
+
+    ubuntu_prepare_config
+    ubuntu_prepare_for_testing
+}
+
+reboot() {
+    if [ -z "$FWD_PORT" ]; then
+        echo "ERROR: Must pass --fwd-port" >&2
+        exit 1
+    fi
+    BOOT_TARGET=$(adb pull /run/adt_reboot_target /dev/stdout) || BOOT_TARGET=""
+    adb $ADBOPTS reboot $BOOT_TARGET
+    wait_booted
+    adb $ADBOPTS forward tcp:$FWD_PORT tcp:22
+    adb $ADBOPTS shell "gdbus call -y -d com.canonical.PropertyService -o /com/canonical/PropertyService -m com.canonical.PropertyService.SetProperty ssh true >/dev/null"
+    ubuntu_prepare_for_testing
+}
+
+cleanup() {
+    adb $ADBOPTS shell pkill powerd-cli
+}
+
+
+#
+# main
+#
+
+# argument parsing
+SHORTOPTS="l:,p:,s:,w,r,b"
+LONGOPTS="login:,password:,serial:,rw,apt-update,reset,reboot,no-reset,fwd-port:"
+
+TEMP=$(getopt -o $SHORTOPTS --long $LONGOPTS -- "$@")
+eval set -- "$TEMP"
+
+while true; do
+    case "$1" in
+        -l|--login)
+            SSH_USER=$2
+            shift 2;;
+        -p|--password)
+            SUDO_PASSWORD="$2"
+            shift 2;;
+        -s|--serial)
+            ADBOPTS="$ADBOPTS -s $2"
+            shift 2;;
+        -b|--reboot)
+            REBOOT="1"
+            shift;;
+        -r|--reset)
+            echo "--reset is currently broken as it does not restore PIN/developer mode. Use -b/--reboot instead." >&2
+            exit 1
+            RESET="1"
+            shift;;
+        # passed in "extraopts" so that --reset is only applied once, not
+        # in between tests that call "revert"
+        --no-reset)
+            RESET=""
+            shift;;
+        --fwd-port)
+            FWD_PORT="$2"
+            shift 2;;
+        --)
+            shift;
+            break;;
+        *)
+            echo "E: $(basename $0): Unsupported option $1" >&2
+            exit 1;;
+    esac
+done
+
+if [ -z "$1" ]; then
+    echo "Needs to be called with command as first argument" >&2
+    exit 1
+fi
+
+cmd=$(echo "$1"|tr [[:upper:]] [[:lower:]])
+shift
+
+case $cmd in
+    open)
+        open;;
+    revert)
+        revert;;
+    reboot)
+        reboot;;
+    cleanup)
+        cleanup;;
+    *)
+        echo "invalid command $cmd" >&2
+        exit 1
+        ;;
+esac

=== modified file 'debian/tests/control'
--- debian/tests/control	2015-03-05 00:36:08 +0000
+++ debian/tests/control	2015-03-09 21:35:41 +0000
@@ -1,2 +1,5 @@
 Tests: ota_basic
-Depends:
+Restrictions: needs-root allow-stderr
+Depends: python3-fixtures,
+         python3-psutil,
+         system-image-dbus (>=3.0)

=== modified file 'debian/tests/ota_basic'
--- debian/tests/ota_basic	2015-03-03 02:58:26 +0000
+++ debian/tests/ota_basic	2015-03-09 21:35:41 +0000
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/python3
 
 #
 # Ubuntu OTA Tests
@@ -18,12 +18,31 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-# Steps:
-#  - Flash device with revision x
-#  - Check device flashed correctly
-#  - Trigger upgrade to revision x+1
-#  - (Wait for upgrade)
-#  - Reboot device
-#  - Check the upgrade worked as expected.
-
-exit 0
+import os
+import subprocess
+
+from ubuntu_ota_tests import services
+
+
+def write_adt_apply_config():
+    config_path = get_system_image_config_dir()
+    adt_apply_config_path = os.path.join(config_path, '01adt_apply.ini')
+    with open(adt_apply_config_path, 'w') as apply_config_file:
+        apply_config_file.write('[hooks]\n')
+        apply_config_file.write(
+            'apply: ubuntu_ota_tests.hooks.ADTRebootToRecovery')
+
+
+def get_system_image_config_dir():
+    return os.environ.get('ADT_ARTIFACTS')
+
+
+if __name__ == '__main__':
+    rebooted_mark = os.environ.get('ADT_REBOOT_MARK', None)
+    if not rebooted_mark:
+        write_adt_apply_config()
+        services.ensure_system_image_dbus_not_running()
+        subprocess.check_call(
+            ['system-image-dbus', '-v', '-C', get_system_image_config_dir()])
+    else:
+        print('Rebooted')

=== added directory 'debian/tests/ubuntu_ota_tests'
=== added file 'debian/tests/ubuntu_ota_tests/__init__.py'
--- debian/tests/ubuntu_ota_tests/__init__.py	1970-01-01 00:00:00 +0000
+++ debian/tests/ubuntu_ota_tests/__init__.py	2015-03-09 21:35:41 +0000
@@ -0,0 +1,27 @@
+#
+# Ubuntu OTA Tests
+# Copyright (C) 2015 Canonical
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+from ubuntu_ota_tests import (
+    services,
+    system,
+)
+
+__all__ = [
+    'services',
+    'system',
+]

=== added file 'debian/tests/ubuntu_ota_tests/hooks.py'
--- debian/tests/ubuntu_ota_tests/hooks.py	1970-01-01 00:00:00 +0000
+++ debian/tests/ubuntu_ota_tests/hooks.py	2015-03-09 21:35:41 +0000
@@ -0,0 +1,42 @@
+#
+# Ubuntu OTA Tests
+# Copyright (C) 2015 Canonical
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+import logging
+import subprocess
+
+from systemimage import apply
+from systemimage.config import config
+
+
+log = logging.getLogger('systemimage')
+
+
+class ADTRebootToRecovery(apply.BaseApply):
+
+    def apply(self):
+        try:
+            with open('/run/adt_reboot_target', 'w') as reboot_target:
+                reboot_target.write('recovery')
+            subprocess.check_call(
+                '/tmp/autopkgtest-reboot', universal_newlines=True)
+        except subprocess.CalledProcessError as error:
+            log.exception('reboot exit status: {}'.format(error.returncode))
+            raise
+        # This code may or may not run.  We're racing against the system
+        # reboot procedure.
+        config.dbus_service.Rebooting(True)

=== added file 'debian/tests/ubuntu_ota_tests/services.py'
--- debian/tests/ubuntu_ota_tests/services.py	1970-01-01 00:00:00 +0000
+++ debian/tests/ubuntu_ota_tests/services.py	2015-03-09 21:35:41 +0000
@@ -0,0 +1,74 @@
+#
+# Ubuntu OTA Tests
+# Copyright (C) 2015 Canonical
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+import dbus
+import logging
+
+from dbus.mainloop.glib import DBusGMainLoop
+
+from ubuntu_ota_tests import system
+
+
+logger = logging.getLogger(__name__)
+
+
+# Is there a better mechanism that we can use to ensure that DBusGMainLoop
+# isn't called more than once?
+_loop_running = False
+
+
+def ensure_loop_running():
+    global _loop_running
+    if not _loop_running:
+        DBusGMainLoop(set_as_default=True)
+        _loop_running = True
+
+
+def get_system_image_interface():
+    """Return a dbus Interface for SystemImage Service.
+
+    Note calling this method will cause system-image-dbus to start (if it's not
+    already started).
+
+    """
+    ensure_loop_running()
+
+    system_bus = dbus.SystemBus()
+    service = system_bus.get_object('com.canonical.SystemImage', '/Service')
+    iface = dbus.Interface(service, 'com.canonical.SystemImage')
+
+    return iface
+
+
+def ensure_system_image_dbus_not_running():
+    if _is_system_image_process_running():
+        sys_image_iface = get_system_image_interface()
+        try:
+            sys_image_iface.Exit()
+        except dbus.DBusException:
+            print("Attempted to exit system dbus when not running.")
+            logger.debug("Attempted to exit system dbus when not running.")
+
+
+def _is_system_image_process_running():
+    """Return True if system-image-dbus process is running False otherwise."""
+    # For some reason the process name is 'system-image-db' on the device.
+    try:
+        return system.get_process_by_name('system-image-db') is not None
+    except OSError:
+        return False

=== added file 'debian/tests/ubuntu_ota_tests/system.py'
--- debian/tests/ubuntu_ota_tests/system.py	1970-01-01 00:00:00 +0000
+++ debian/tests/ubuntu_ota_tests/system.py	2015-03-09 21:35:41 +0000
@@ -0,0 +1,33 @@
+#
+# Ubuntu OTA Tests
+# Copyright (C) 2015 Canonical
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+import psutil
+
+
+def get_process_by_name(process_name):
+    """Return a psutil.Process for the process with the given name.
+
+    :raises err something: if a process cannot be found with the given name.
+
+    """
+    try:
+        return [
+            p for p in psutil.process_iter() if p.name() == process_name
+        ][0]
+    except IndexError:
+        raise OSError('No process found with the name "'+process_name+'"')