Merge lp:~barry/ubuntu-system-image/lp1373467 into lp:~registry/ubuntu-system-image/client

[Barry Warsaw]

This finally passes all tests and I think is ready for merging to trunk. I predict the diff will be enormous and conflicty ;).

=== modified file '.bzrignore'
--- .bzrignore	2014-11-03 21:36:27 +0000
+++ .bzrignore	2015-01-15 22:43:25 +0000
@@ -12,3 +12,5 @@
 coverage.xml
 htmlcov
 coverage-*
+py34-curl
+py34-udm

=== modified file 'cli-manpage.rst'
--- cli-manpage.rst	2014-10-25 01:12:08 +0000
+++ cli-manpage.rst	2015-01-15 22:43:25 +0000
@@ -7,9 +7,9 @@
 ------------------------------------------------
 
 :Author: Barry Warsaw <[e-mail]>
-:Date: 2014-10-23
-:Copyright: 2013-2014 Canonical Ltd.
-:Version: 2.5.1
+:Date: 2015-01-15
+:Copyright: 2013-2015 Canonical Ltd.
+:Version: 3.0
 :Manual section: 1
 
 
@@ -84,10 +84,13 @@
     enabled.  With two ``-v`` (or ``-vv``), logging both to the console and to
     the log file are output at ``DEBUG`` level.
 
--C FILE, --config FILE
-    Use the given configuration file, otherwise use the default.  The program
-    will optionally also read a ``channel.ini`` file in the same directory as
-    ``FILE``.
+-C DIR, --config DIR
+    Use the given configuration directory, otherwise use the system default.
+    The program will read all the files in this directory that begin with a
+    number, followed by an underscore, and ending in ``.ini``
+    (e.g. ``03_myconfig.ini``).  The files are read in sorted numerical order
+    from lowest prefix number to highest, with later configuration files able
+    to override any variable in any section.
 
 --factory-reset
     Wipes the data partition and issues a reboot into recovery.  This
@@ -112,15 +115,11 @@
 FILES
 =====
 
-/etc/system-image/client.ini
-    Default configuration file.
-
-/etc/system-image/channel.ini
-    Optional configuration file overrides (for the ``[service]`` section
-    only).
+/etc/system-image/[0-9]+*.ini
+    Default configuration files.
 
 
 SEE ALSO
 ========
 
-client.ini(5), system-image-dbus(8)
+system-image.ini(5), system-image-dbus(8)

=== modified file 'dbus-manpage.rst'
--- dbus-manpage.rst	2014-11-10 16:17:36 +0000
+++ dbus-manpage.rst	2015-01-15 22:43:25 +0000
@@ -7,9 +7,9 @@
 -----------------------------------------
 
 :Author: Barry Warsaw <[e-mail]>
-:Date: 2014-09-29
-:Copyright: 2013-2014 Canonical Ltd.
-:Version: 2.5
+:Date: 2015-01-15
+:Copyright: 2013-2015 Canonical Ltd.
+:Version: 3.0
 :Manual section: 8
 
 
@@ -42,10 +42,13 @@
     enabled.  With two ``-v`` (or ``-vv``), logging both to the console and to
     the log file are output at ``DEBUG`` level.
 
--C FILE, --config FILE
-    Use the given configuration file, otherwise use the default.  The program
-    will optionally also read a ``channel.ini`` file in the same directory as
-    ``FILE``.
+-C DIR, --config DIR
+    Use the given configuration directory, otherwise use the system default.
+    The program will read all the files in this directory that begin with a
+    number, followed by an underscore, and ending in ``.ini``
+    (e.g. ``03_myconfig.ini``).  The files are read in sorted numerical order
+    from lowest prefix number to highest, with later configuration files able
+    to override any variable in any section.
 
 
 D-BUS API
@@ -311,12 +314,8 @@
 FILES
 =====
 
-/etc/system-image/client.ini
-    Default configuration file.
-
-/etc/system-image/channel.ini
-    Optional configuration file overrides (for the ``[service]`` section
-    only).
+/etc/system-image/[0-9]+*.ini
+    Default configuration files.
 
 /etc/dbus-1/system.d/com.canonical.SystemImage.conf
     DBus service permissions file.
@@ -328,6 +327,7 @@
 SEE ALSO
 ========
 
-client.ini(5), system-image-cli(1)
+system-image.ini(5), system-image-cli(1)
+
 
 .. _`ISO 8601`: http://en.wikipedia.org/wiki/ISO_8601

=== modified file 'ini-manpage.rst'
--- ini-manpage.rst	2014-09-29 14:05:29 +0000
+++ ini-manpage.rst	2015-01-15 22:43:25 +0000
@@ -1,39 +1,43 @@
-==========
-client.ini
-==========
-
-
------------------------------------------------
-Ubuntu System Image Upgrader configuration file
------------------------------------------------
+================
+system-image.ini
+================
+
+
+------------------------------------------------
+Ubuntu System Image Upgrader configuration files
+------------------------------------------------
 
 :Author: Barry Warsaw <[e-mail]>
-:Date: 2014-09-29
-:Copyright: 2013-2014 Canonical Ltd.
-:Version: 2.5
+:Date: 2015-01-15
+:Copyright: 2013-2015 Canonical Ltd.
+:Version: 3.0
 :Manual section: 5
 
 
 DESCRIPTION
 ===========
 
-``/etc/system-image/client.ini`` is the configuration file for the system
-image upgrader.  It is an ini-style configuration file with sections that
+``/etc/system-image/`` is the default configuration directory for the system
+image upgrader.  It contains ini-style configuration files with sections that
 define the service to connect to, as well as local system resources.
 Generally, the options never need to be changed.
 
-The system image upgrader will also optionally read a
-``/etc/system-image/channel.ini`` file with the same format as ``client.ini``.
-This file should only contain a ``[service]`` section for overriding in the
-``client.ini`` file.  All other sections are ignored.
+The system image upgrader will read a all files in this directory that start
+with a numeric prefix, followed by an underscore, and then any alphanumeric
+suffix, ending in ``.ini``.  E.g. ``07_myconfig.ini``.
+
+The files are read in sorted numerical order, from lowest prefix number to
+highest, with later configuration files able to override any variable in any
+section.
 
 
 SYNTAX
 ======
 
-Sections are delimited by square brackets, e.g. ``[service]``.  Variables
-inside the service separate the variable name and value by a colon.  Blank
-lines and lines that start with a ``#`` are ignored.
+Sections in the ``.ini`` files are delimited by square brackets,
+e.g. ``[service]``.  Variables inside the service separate the variable name
+and value by a colon.  Blank lines and lines that start with a ``#`` are
+ignored.
 
 
 THE SERVICE SECTION
@@ -82,10 +86,6 @@
 
 This section contains the following variables:
 
-build_file
-    The file on the local file system containing the system's current build
-    number.
-
 tempdir
     The base temporary directory on the local file system.  When any of the
     system-image processes run, a secure subdirectory inside `tempdir` will be
@@ -204,6 +204,7 @@
 
 system-image-cli(1)
 
+
 [1]: https://wiki.ubuntu.com/ImageBasedUpgrades/Server
 
 [2]: https://wiki.ubuntu.com/ImageBasedUpgrades/GPG

=== modified file 'systemimage/api.py'
--- systemimage/api.py	2014-08-08 19:06:47 +0000
+++ systemimage/api.py	2015-01-15 22:43:25 +0000
@@ -24,7 +24,6 @@
 
 import logging
 
-from systemimage.helpers import last_update_date
 from systemimage.reboot import factory_reset
 from systemimage.state import State
 from unittest.mock import patch
@@ -62,10 +61,6 @@
             # No winners.
             return ''
 
-    @property
-    def last_update_date(self):
-        return last_update_date()
-
 
 class Mediator:
     """This is the DBus API mediator.

=== modified file 'systemimage/config.py'
--- systemimage/config.py	2014-10-29 15:26:04 +0000
+++ systemimage/config.py	2015-01-15 22:43:25 +0000
@@ -17,7 +17,6 @@
 
 __all__ = [
     'Configuration',
-    'DISABLED',
     'config',
     ]
 
@@ -27,82 +26,175 @@
 
 from configparser import ConfigParser
 from contextlib import ExitStack
-from pkg_resources import resource_filename
+from pathlib import Path
 from systemimage.bag import Bag
 from systemimage.helpers import (
-    as_loglevel, as_object, as_timedelta, makedirs, temporary_directory)
-
-
-DISABLED = object()
+    NO_PORT, as_loglevel, as_object, as_port, as_stripped, as_timedelta,
+    makedirs, temporary_directory)
+
+
+SECTIONS = ('service', 'system', 'gpg', 'updater', 'hooks', 'dbus')
 
 
 def expand_path(path):
     return os.path.abspath(os.path.expanduser(path))
 
 
-def port_value_converter(value):
-    if value.lower() in ('disabled', 'disable'):
-        return DISABLED
-    result = int(value)
-    if result < 0:
-        raise ValueError(value)
-    return result
-
-
-def device_converter(value):
-    return value.strip()
+class SafeConfigParser(ConfigParser):
+    """Like ConfigParser, but with default empty sections.
+
+    This makes the **style of loading keys/values into the Bag objects a
+    little cleaner since it doesn't have to worry about KeyErrors when a
+    configuration file doesn't contain a section, which is allowed.
+    """
+
+    def __init__(self, *args, **kws):
+        super().__init__(args, **kws)
+        for section in SECTIONS:
+            self[section] = {}
 
 
 class Configuration:
-    def __init__(self, ini_file=None):
-        # Defaults.
-        self.config_file = None
-        self.service = Bag()
-        self.system = Bag()
-        if ini_file is None:
-            ini_file = resource_filename('systemimage.data', 'client.ini')
-        self.load(ini_file)
-        self._override = False
+    def __init__(self, directory=None):
+        self._set_defaults()
         # 2013-10-14 BAW This is a placeholder for rendezvous between the
-        # downloader and the D-Bus service.  When running udner D-Bus and we
+        # downloader and the D-Bus service.  When running under D-Bus and we
         # get a `paused` signal from the download manager, we need this to
         # plumb through an UpdatePaused signal to our clients.  It rather
         # sucks that we need a global for this, but I can't get the plumbing
         # to work otherwise.  This seems like the least horrible place to
         # stash this global.
         self.dbus_service = None
-        # Cache/overrides.
+        # Cache.
         self._device = None
         self._build_number = None
+        self.build_number_override = False
         self._channel = None
         # This is used only to override the phased percentage via command line
         # and the property setter.
         self._phase_override = None
         self._tempdir = None
+        self.config_d = None
+        self.ini_files = []
+        self.http_base = None
+        self.https_base = None
+        if directory is not None:
+            self.load(directory)
+        self._calculate_http_bases()
         self._resources = ExitStack()
         atexit.register(self._resources.close)
 
-    def load(self, path, *, override=False):
-        parser = ConfigParser()
-        files_read = parser.read(path)
-        if files_read != [path]:
+    def _set_defaults(self):
+        self.service = Bag(
+            base='system-image.ubuntu.com',
+            http_port=80,
+            https_port=443,
+            channel='daily',
+            build_number=0,
+            )
+        self.system = Bag(
+            timeout=as_timedelta('1h'),
+            tempdir='/tmp',
+            logfile='/var/log/system-image/client.log',
+            loglevel=as_loglevel('info'),
+            settings_db='/var/lib/system-image/settings.db',
+            )
+        self.gpg = Bag(
+            archive_master='/etc/system-image/archive-master.tar.xz',
+            image_master='/var/lib/system-image/keyrings/image-master.tar.xz',
+            image_signing=
+                '/var/lib/system-image/keyrings/image-signing.tar.xz',
+            device_signing=
+                '/var/lib/system-image/keyrings/device-signing.tar.xz',
+            )
+        self.updater = Bag(
+            cache_partition='/android/cache/recovery',
+            data_partition='/var/lib/system-image',
+            )
+        self.hooks = Bag(
+            device=as_object('systemimage.device.SystemProperty'),
+            scorer=as_object('systemimage.scores.WeightedScorer'),
+            reboot=as_object('systemimage.reboot.Reboot'),
+            )
+        self.dbus = Bag(
+            lifetime=as_timedelta('10m'),
+            )
+
+    def _load_file(self, path):
+        parser = SafeConfigParser()
+        str_path = str(path)
+        files_read = parser.read(str_path)
+        if files_read != [str_path]:
             raise FileNotFoundError(path)
-        self.config_file = path
-        self.service.update(converters=dict(http_port=port_value_converter,
-                                            https_port=port_value_converter,
+        self.ini_files.append(path)
+        self.service.update(converters=dict(http_port=as_port,
+                                            https_port=as_port,
                                             build_number=int,
-                                            device=device_converter,
+                                            device=as_stripped,
                                             ),
-                           **parser['service'])
-        if (self.service.http_port is DISABLED and
-            self.service.https_port is DISABLED):
+                            **parser['service'])
+        self.system.update(converters=dict(timeout=as_timedelta,
+                                           loglevel=as_loglevel,
+                                           settings_db=expand_path,
+                                           tempdir=expand_path),
+                            **parser['system'])
+        self.gpg.update(**parser['gpg'])
+        self.updater.update(**parser['updater'])
+        self.hooks.update(converters=dict(device=as_object,
+                                          scorer=as_object,
+                                          reboot=as_object),
+                          **parser['hooks'])
+        self.dbus.update(converters=dict(lifetime=as_timedelta),
+                         **parser['dbus'])
+
+    def load(self, directory):
+        """Load up the configuration from a config.d directory."""
+        # Look for all the files in the given directory with .ini or .cfg
+        # suffixes.  The files must start with a number, and the files are
+        # loaded in numeric order.
+        if self.config_d is not None:
+            raise RuntimeError('Configuration already loaded; use .reload()')
+        self.config_d = directory
+        if not Path(directory).is_dir():
+            raise TypeError(
+                '.load() requires a directory: {}'.format(directory))
+        candidates = []
+        for child in Path(directory).glob('*.ini'):
+            order, _, base = child.stem.partition('_')
+            # XXX 2014-10-03: The logging system isn't initialized when we get
+            # here, so we can't log that these files are being ignored.
+            if len(_) == 0:
+                continue
+            try:
+                serial = int(order)
+            except ValueError:
+                continue
+            candidates.append((serial, child))
+        for serial, path in sorted(candidates):
+            self._load_file(path)
+        self._calculate_http_bases()
+
+    def reload(self):
+        """Reload the configuration directory."""
+        # Reset some cached attributes.
+        directory = self.config_d
+        self.ini_files = []
+        self.config_d = None
+        self._build_number = None
+        # Now load the defaults, then reload the previous config.d directory.
+        self._set_defaults()
+        self.load(directory)
+
+    def _calculate_http_bases(self):
+        if (self.service.http_port is NO_PORT and
+            self.service.https_port is NO_PORT):
             raise ValueError('Cannot disable both http and https ports')
         # Construct the HTTP and HTTPS base urls, which most applications will
-        # actually use.  We do this in two steps, in order to support
-        # disabling one or the other (but not both) protocols.
+        # actually use.  We do this in two steps, in order to support disabling
+        # one or the other (but not both) protocols.
         if self.service.http_port == 80:
             http_base = 'http://{}'.format(self.service.base)
-        elif self.service.http_port is DISABLED:
+        elif self.service.http_port is NO_PORT:
             http_base = None
         else:
             http_base = 'http://{}:{}'.format(
@@ -110,7 +202,7 @@
         # HTTPS.
         if self.service.https_port == 443:
             https_base = 'https://{}'.format(self.service.base)
-        elif self.service.https_port is DISABLED:
+        elif self.service.https_port is NO_PORT:
             https_base = None
         else:
             https_base = 'https://{}:{}'.format(
@@ -122,45 +214,13 @@
         if https_base is None:
             assert http_base is not None
             https_base = http_base
-        self.service['http_base'] = http_base
-        self.service['https_base'] = https_base
-        try:
-            self.system.update(converters=dict(timeout=as_timedelta,
-                                               build_file=expand_path,
-                                               loglevel=as_loglevel,
-                                               settings_db=expand_path,
-                                               tempdir=expand_path),
-                              **parser['system'])
-        except KeyError:
-            # If we're overriding via a channel.ini file, it's okay if the
-            # [system] section is missing.  However, the main configuration
-            # ini file must include all sections.
-            if not override:
-                raise
-        # Short-circuit, since we're loading a channel.ini file.
-        self._override = override
-        if override:
-            return
-        self.gpg = Bag(**parser['gpg'])
-        self.updater = Bag(**parser['updater'])
-        self.hooks = Bag(converters=dict(device=as_object,
-                                         scorer=as_object,
-                                         reboot=as_object),
-                         **parser['hooks'])
-        self.dbus = Bag(converters=dict(lifetime=as_timedelta),
-                        **parser['dbus'])
+        self.http_base = http_base
+        self.https_base = https_base
 
     @property
     def build_number(self):
         if self._build_number is None:
-            if self._override:
-                return self.service.build_number
-            else:
-                try:
-                    with open(self.system.build_file, encoding='utf-8') as fp:
-                        return int(fp.read().strip())
-                except FileNotFoundError:
-                    return 0
+            self._build_number = self.service.build_number
         return self._build_number
 
     @build_number.setter
@@ -169,24 +229,18 @@
             raise ValueError(
                 'integer is required, got: {}'.format(type(value).__name__))
         self._build_number = value
+        self.build_number_override = True
 
     @build_number.deleter
     def build_number(self):
         self._build_number = None
 
     @property
-    def build_number_cli(self):
-        return self._build_number
-
-    @property
     def device(self):
         if self._device is None:
             # Start by looking for a [service]device setting.  Use this if it
             # exists, otherwise fall back to calling the hook.
             self._device = getattr(self.service, 'device', None)
-            # The key could exist in the channel.ini file, but its value could
-            # be empty.  That's semantically equivalent to a missing
-            # [service]device setting.
             if not self._device:
                 self._device = self.hooks.device().get_device()
         return self._device
@@ -227,20 +281,8 @@
         return self._tempdir
 
 
-# Define the global configuration object.  Normal use can be as simple as:
-#
-# from systemimage.config import config
-# build_file = config.system.build_file
-#
-# In the test suite though, the actual configuration object can be easily
-# patched by doing something like this:
-#
-# test_config = Configuration(...)
-# with unittest.mock.patch('config._config', test_config):
-#     run_test()
-#
-# and now every module which does the first code example will get build_file
-# from the mocked Configuration instance.
+# Define the global configuration object.  We use a proxy here so that
+# post-object creation loading will work.
 
 _config = Configuration()
 

=== removed file 'systemimage/data/client.ini'
--- systemimage/data/client.ini	2013-11-12 19:57:39 +0000
+++ systemimage/data/client.ini	1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-# Default and example .ini configuration file.
-# Edit this and put it in /etc/system-image/client.ini
-
-[service]
-base: system-image.ubuntu.com
-http_port: 80
-https_port: 443
-channel: daily
-build_number: 0
-
-[system]
-timeout: 1h
-build_file: /etc/ubuntu-build
-tempdir: /tmp
-logfile: /var/log/system-image/client.log
-loglevel: info
-settings_db: /var/lib/system-image/settings.db
-
-[gpg]
-archive_master: /etc/system-image/archive-master.tar.xz
-image_master: /var/lib/system-image/keyrings/image-master.tar.xz
-image_signing: /var/lib/system-image/keyrings/image-signing.tar.xz
-device_signing: /var/lib/system-image/keyrings/device-signing.tar.xz
-
-[updater]
-cache_partition: /android/cache/recovery
-data_partition: /var/lib/system-image
-
-[hooks]
-device: systemimage.device.SystemProperty
-scorer: systemimage.scores.WeightedScorer
-reboot: systemimage.reboot.Reboot
-
-[dbus]
-lifetime: 10m

=== modified file 'systemimage/dbus.py'
--- systemimage/dbus.py	2014-10-30 20:47:36 +0000
+++ systemimage/dbus.py	2015-01-15 22:43:25 +0000
@@ -126,7 +126,7 @@
             downloading,
             self._update.version,
             self._update.size,
-            self._update.last_update_date,
+            last_update_date(),
             self._update.error)
         # Stop GLib from calling this method again.
         return False
@@ -161,7 +161,7 @@
                     self._downloading,
                     self._update.version,
                     self._update.size,
-                    self._update.last_update_date,
+                    last_update_date(),
                     "")
             log.info('checking lock not acquired')
             return

=== modified file 'systemimage/helpers.py'
--- systemimage/helpers.py	2014-12-02 01:12:41 +0000
+++ systemimage/helpers.py	2015-01-15 22:43:25 +0000
@@ -20,6 +20,8 @@
     'MiB',
     'as_loglevel',
     'as_object',
+    'as_port',
+    'as_stripped',
     'as_timedelta',
     'atomic',
     'calculate_signature',
@@ -50,6 +52,7 @@
 DEFAULT_DIRMODE = 0o02700
 MiB = 1 << 20
 EMPTYSTRING = ''
+NO_PORT = object()
 
 
 def calculate_signature(fp, hash_class=None):
@@ -78,7 +81,7 @@
     """Like os.remove() but don't complain if the file doesn't exist."""
     try:
         os.remove(path)
-    except (FileNotFoundError, IsADirectoryError):
+    except (FileNotFoundError, IsADirectoryError, PermissionError):
         pass
 
 
@@ -194,13 +197,26 @@
         dbus = 'ERROR'
     main_level = getattr(logging, main, None)
     if main_level is None or not isinstance(main_level, int):
-        raise ValueError
+        raise ValueError(value)
     dbus_level = getattr(logging, dbus, None)
     if dbus_level is None or not isinstance(dbus_level, int):
-        raise ValueError
+        raise ValueError(value)
     return main_level, dbus_level
 
 
+def as_port(value):
+    if value.lower() in ('disabled', 'disable'):
+        return NO_PORT
+    result = int(value)
+    if result < 0:
+        raise ValueError(value)
+    return result
+
+
+def as_stripped(value):
+    return value.strip()
+
+
 @contextmanager
 def temporary_directory(*args, **kws):
     """A context manager that creates a temporary directory.
@@ -226,30 +242,24 @@
 def last_update_date():
     """Return the last update date.
 
-    Taken from the mtime of the following files, in order:
-
-    - /userdata/.last_update
-    - /etc/system-image/channel.ini
-    - /etc/ubuntu-build
-
-    First existing path wins.
+    If /userdata/.last_update exists, we use this file's mtime.  If it doesn't
+    exist, then we use the latest mtime of any of the files in
+    /etc/system-image/config.d/*.ini (or whatever directory was given with the
+    -C/--config option).
     """
     # Avoid circular imports.
     from systemimage.config import config
-    channel_ini = os.path.join(
-        os.path.dirname(config.config_file), 'channel.ini')
-    ubuntu_build = config.system.build_file
-    for path in (LAST_UPDATE_FILE, channel_ini, ubuntu_build):
-        try:
-            # Local time, since we can't know the timezone.
-            timestamp = datetime.fromtimestamp(os.stat(path).st_mtime)
-            # Seconds resolution.
-            timestamp = timestamp.replace(microsecond=0)
-            return str(timestamp)
-        except (FileNotFoundError, PermissionError):
-            pass
-    else:
-        return 'Unknown'
+    try:
+        timestamp = datetime.fromtimestamp(os.stat(LAST_UPDATE_FILE).st_mtime)
+    except (FileNotFoundError, PermissionError):
+        # We fall back to the latest mtime of the config.d/*.ini files.
+        timestamps = sorted(
+            datetime.fromtimestamp(path.stat().st_mtime)
+            for path in config.ini_files)
+        if len(timestamps) == 0:
+            return 'Unknown'
+        timestamp = timestamps[-1]
+    return str(timestamp.replace(microsecond=0))
 
 
 def version_detail(details_string=None):

=== modified file 'systemimage/keyring.py'
--- systemimage/keyring.py	2014-09-26 09:32:29 +0000
+++ systemimage/keyring.py	2015-01-15 22:43:25 +0000
@@ -86,8 +86,8 @@
     else:
         srcurl = urls
         ascurl = urls + '.asc'
-    tarxz_src = urljoin(config.service.https_base, srcurl)
-    ascxz_src = urljoin(config.service.https_base, ascurl)
+    tarxz_src = urljoin(config.https_base, srcurl)
+    ascxz_src = urljoin(config.https_base, ascurl)
     # Calculate the local paths to the temporary download files.  The
     # blacklist goes to the data partition and all the other files go to the
     # cache partition.

=== modified file 'systemimage/main.py'
--- systemimage/main.py	2014-10-25 01:12:08 +0000
+++ systemimage/main.py	2015-01-15 22:43:25 +0000
@@ -21,7 +21,6 @@
     ]
 
 
-import os
 import sys
 import logging
 import argparse
@@ -42,12 +41,11 @@
 __version__ = resource_bytes(
     'systemimage', 'version.txt').decode('utf-8').strip()
 
-DEFAULT_CONFIG_FILE = '/etc/system-image/client.ini'
+DEFAULT_CONFIG_D = '/etc/system-image/config.d'
 COLON = ':'
 
 
 def main():
-    global config
     parser = argparse.ArgumentParser(
         prog='system-image-cli',
         description='Ubuntu System Image Upgrader')
@@ -55,7 +53,7 @@
                         action='version',
                         version='system-image-cli {}'.format(__version__))
     parser.add_argument('-C', '--config',
-                        default=DEFAULT_CONFIG_FILE, action='store',
+                        default=DEFAULT_CONFIG_D, action='store',
                         metavar='FILE',
                         help="""Use the given configuration file instead of
                                 the default""")
@@ -137,16 +135,10 @@
     args = parser.parse_args(sys.argv[1:])
     try:
         config.load(args.config)
-    except FileNotFoundError as error:
-        parser.error('\nConfiguration file not found: {}'.format(error))
+    except (TypeError, FileNotFoundError):
+        parser.error('\nConfiguration directory not found: {}'.format(
+            args.config))
         assert 'parser.error() does not return' # pragma: no cover
-    # Load the optional channel.ini file, which must live next to the
-    # configuration file.  It's okay if this file does not exist.
-    channel_ini = os.path.join(os.path.dirname(args.config), 'channel.ini')
-    try:
-        config.load(channel_ini, override=True)
-    except FileNotFoundError:
-        pass
 
     # Perform a factory reset.
     if args.factory_reset:

=== modified file 'systemimage/scores.py'
--- systemimage/scores.py	2014-10-25 01:12:08 +0000
+++ systemimage/scores.py	2015-01-15 22:43:25 +0000
@@ -53,6 +53,7 @@
         :rtype: list
         """
         if len(candidates) == 0:
+            log.debug('No candidates, so no winner')
             return []
         # We want to zip together the score for each candidate path, plus the
         # candidate path, so that when we sort the sequence, we'll always get

=== modified file 'systemimage/service.py'
--- systemimage/service.py	2014-10-17 16:10:07 +0000
+++ systemimage/service.py	2015-01-15 22:43:25 +0000
@@ -20,7 +20,6 @@
     ]
 
 
-import os
 import sys
 import dbus
 import logging
@@ -33,7 +32,8 @@
 from systemimage.dbus import Loop
 from systemimage.helpers import makedirs
 from systemimage.logging import initialize
-from systemimage.main import DEFAULT_CONFIG_FILE
+from systemimage.main import DEFAULT_CONFIG_D
+
 
 # --testing is only enabled when the systemimage.testing package is
 # available.  This will be the case for the upstream source package, and when
@@ -60,7 +60,7 @@
                         action='version',
                         version='system-image-dbus {}'.format(__version__))
     parser.add_argument('-C', '--config',
-                        default=DEFAULT_CONFIG_FILE, action='store',
+                        default=DEFAULT_CONFIG_D, action='store',
                         metavar='FILE',
                         help="""Use the given configuration file instead of
                                 the default""")
@@ -80,15 +80,8 @@
     try:
         config.load(args.config)
     except FileNotFoundError as error:
-        parser.error('\nConfiguration file not found: {}'.format(error))
+        parser.error('\nConfiguration directory not found: {}'.format(error))
         assert 'parser.error() does not return' # pragma: no cover
-    # Load the optional channel.ini file, which must live next to the
-    # configuration file.  It's okay if this file does not exist.
-    channel_ini = os.path.join(os.path.dirname(args.config), 'channel.ini')
-    try:
-        config.load(channel_ini, override=True)
-    except FileNotFoundError:
-        pass
 
     # Create the temporary directory if it doesn't exist.
     makedirs(config.system.tempdir)
@@ -121,6 +114,7 @@
         else:
             from systemimage.dbus import Service
             config.dbus_service = Service(system_bus, '/Service', loop)
+
         try:
             loop.run()
         except KeyboardInterrupt:                   # pragma: no cover

=== modified file 'systemimage/state.py'
--- systemimage/state.py	2014-11-05 14:59:14 +0000
+++ systemimage/state.py	2015-01-15 22:43:25 +0000
@@ -214,7 +214,7 @@
             # I think it makes no sense to check the blacklist when we're
             # downloading a blacklist file.
             log.info('Looking for blacklist: {}'.format(
-                     urljoin(config.service.https_base, url)))
+                     urljoin(config.https_base, url)))
             get_keyring('blacklist', url, 'image-master')
         except SignatureError:
             log.exception('No signed blacklist found')
@@ -250,7 +250,7 @@
         url = 'gpg/blacklist.tar.xz'
         try:
             log.info('Looking for blacklist again: {}',
-                     urljoin(config.service.https_base, url))
+                     urljoin(config.https_base, url))
             get_keyring('blacklist', url, 'image-master')
         except FileNotFoundError:
             log.info('No blacklist found on second attempt')
@@ -276,9 +276,9 @@
             get_keyring(
                 'image-signing', 'gpg/image-signing.tar.xz', 'image-master',
                 self.blacklist)
-        channels_url = urljoin(config.service.https_base, 'channels.json')
+        channels_url = urljoin(config.https_base, 'channels.json')
         channels_path = os.path.join(config.tempdir, 'channels.json')
-        asc_url = urljoin(config.service.https_base, 'channels.json.asc')
+        asc_url = urljoin(config.https_base, 'channels.json.asc')
         asc_path = os.path.join(config.tempdir, 'channels.json.asc')
         log.info('Looking for: {}', channels_url)
         with ExitStack() as stack:
@@ -332,8 +332,8 @@
         self._next.append(partial(self._get_index, device.index))
 
     def _get_device_keyring(self, keyring):
-        keyring_url = urljoin(config.service.https_base, keyring.path)
-        asc_url = urljoin(config.service.https_base, keyring.signature)
+        keyring_url = urljoin(config.https_base, keyring.path)
+        asc_url = urljoin(config.https_base, keyring.signature)
         log.info('getting device keyring: {}', keyring_url)
         get_keyring(
             'device-signing', (keyring_url, asc_url), 'image-signing',
@@ -381,7 +381,7 @@
 
     def _get_index(self, index):
         """Get and verify the index.json file."""
-        index_url = urljoin(config.service.https_base, index)
+        index_url = urljoin(config.https_base, index)
         asc_url = index_url + '.asc'
         index_path = os.path.join(config.tempdir, 'index.json')
         asc_path = index_path + '.asc'
@@ -413,7 +413,7 @@
         # winner.  Otherwise, trust the configured build number.
         channel = self.channels[config.channel]
         # channel_target is the channel we're on based on the alias mapping in
-        # our channel.ini file.  channel_alias is the alias mapping in the
+        # our config files.  channel_alias is the alias mapping in the
         # channel.json file, i.e. the channel an update will put us on.
         channel_target = getattr(config.service, 'channel_target', None)
         channel_alias = getattr(channel, 'alias', None)
@@ -421,14 +421,17 @@
                 channel_target is None or
                 channel_alias == channel_target):
             build_number = config.build_number
-        elif config.build_number_cli is not None:
-            # An explicit --build on the command line still takes precedence.
-            build_number = config.build_number_cli
         else:
-            # This is a channel switch caused by a new alias.
-            build_number = 0
+            # This is a channel switch caused by a new alias.  Unless the
+            # build number has been explicitly overridden on the command line
+            # via --build/-b, use build number 0 to force a full update.
+            build_number = (config.build_number
+                            if config.build_number_override
+                            else 0)
             self.channel_switch = (channel_target, channel_alias)
         candidates = get_candidates(self.index, build_number)
+        log.debug('Candidates from build# {}: {}'.format(
+            build_number, len(candidates)))
         if self._filter is not None:
             candidates = self._filter(candidates)
         self.winner = config.hooks.scorer().choose(
@@ -480,11 +483,11 @@
             else:
                 # Add the data file, which has a checksum.
                 downloads.append(Record(
-                    urljoin(config.service.http_base, filerec.path),
+                    urljoin(config.http_base, filerec.path),
                     dst, checksum))
                 # Add the signature file, which does not have a checksum.
                 downloads.append(Record(
-                    urljoin(config.service.http_base, filerec.signature),
+                    urljoin(config.http_base, filerec.signature),
                     asc))
                 signatures.append((dst, asc))
                 checksums.append((dst, checksum))

=== modified file 'systemimage/testing/controller.py'
--- systemimage/testing/controller.py	2015-01-13 15:20:40 +0000
+++ systemimage/testing/controller.py	2015-01-15 22:43:25 +0000
@@ -35,7 +35,7 @@
 from pkg_resources import resource_string as resource_bytes
 from systemimage.helpers import temporary_directory
 from systemimage.testing.helpers import (
-    data_path, find_dbus_process, reset_envar)
+    data_path, find_dbus_process, makedirs, reset_envar)
 from unittest.mock import patch
 
 
@@ -148,7 +148,6 @@
         # Public.
         self.tmpdir = self._stack.enter_context(temporary_directory())
         self.config_path = os.path.join(self.tmpdir, 'dbus-system.conf')
-        self.ini_path = None
         self.serverdir = self._stack.enter_context(temporary_directory())
         self.daemon_pid = None
         self.mode = 'live'
@@ -169,10 +168,12 @@
         ini_logfile = (os.path.join(ini_tmpdir, 'client.log')
                        if logfile is None
                        else logfile)
-        self.ini_path = os.path.join(self.tmpdir, 'client.ini')
+        self.ini_path = os.path.join(self.tmpdir, 'config.d')
+        makedirs(self.ini_path)
         template = resource_bytes(
-            'systemimage.tests.data', 'config_03.ini').decode('utf-8')
-        with open(self.ini_path, 'w', encoding='utf-8') as fp:
+            'systemimage.tests.data', '01.ini').decode('utf-8')
+        defaults = os.path.join(self.ini_path, '00_defaults.ini')
+        with open(defaults, 'w', encoding='utf-8') as fp:
             print(template.format(tmpdir=ini_tmpdir,
                                   vardir=ini_vardir,
                                   logfile=ini_logfile,
@@ -245,7 +246,7 @@
             daemon_exe,
             #'/usr/lib/x86_64-linux-gnu/dbus-1.0/debug-build/bin/dbus-daemon',
             '--fork',
-            '--config-file=' + self.config_path,
+            '--config-file=' + str(self.config_path),
             # Return the address and pid on stdout.
             '--print-address=1',
             '--print-pid=1',

=== modified file 'systemimage/testing/dbus.py'
--- systemimage/testing/dbus.py	2014-10-17 16:10:07 +0000
+++ systemimage/testing/dbus.py	2015-01-15 22:43:25 +0000
@@ -71,6 +71,7 @@
     @log_and_exit
     @method('com.canonical.SystemImage')
     def Reset(self):
+        config.reload()
         self._api = Mediator()
         try:
             self._checking.release()

=== modified file 'systemimage/testing/helpers.py'
--- systemimage/testing/helpers.py	2014-11-05 14:59:14 +0000
+++ systemimage/testing/helpers.py	2015-01-15 22:43:25 +0000
@@ -49,7 +49,7 @@
 import unittest
 
 from contextlib import ExitStack, contextmanager, suppress
-from functools import partial, wraps
+from functools import partial, partialmethod, wraps
 from http.server import HTTPServer, SimpleHTTPRequestHandler
 from pathlib import Path
 from pkg_resources import resource_filename, resource_string as resource_bytes
@@ -58,7 +58,6 @@
 from systemimage.config import Configuration, config
 from systemimage.helpers import MiB, atomic, makedirs, temporary_directory
 from systemimage.index import Index
-from systemimage.state import State
 from threading import Thread
 from unittest.mock import patch
 
@@ -208,47 +207,98 @@
         return resources.pop_all()
 
 
-def configuration(function):
-    """Decorator that produces a temporary configuration for testing.
-
-    The config_00.ini template is copied to a temporary file and the the
-    various file system locations are filled in with the location for a,
-    er, temporary temporary directory.  This temporary configuration
-    file is loaded up and the global configuration object is patched so
-    that all other code will see it instead of the default global
-    configuration object.
-
-    Everything is properly cleaned up after the test method exits.
-    """
-    @wraps(function)
-    def wrapper(*args, **kws):
-        with ExitStack() as resources:
-            etc_dir = resources.enter_context(temporary_directory())
-            ini_file = os.path.join(etc_dir, 'client.ini')
-            temp_tmpdir = resources.enter_context(temporary_directory())
-            temp_vardir = resources.enter_context(temporary_directory())
+# This defines the @configuration decorator used in various test suites to
+# create a temporary config.d/ directory for a test.  This is all fairly
+# complicated, but here's what's going on.
+#
+# The _wrapper() function is the inner part of the decorator, and it does the
+# heart of the operation, which is to create a temporary directory for
+# config.d, along with temporary var and tmp directories.  These latter two
+# will be interpolated into any configuration file copied into config.d.
+#
+# The outer decorator function differs depending on whether @configuration was
+# given without arguments, or called with arguments at the time of the
+# function definition.
+#
+# In the former case, e.g.
+#
+# @configuration
+# def test_something(self):
+#
+# The default 00.ini file is interpolated and copied into config.d.  Simple.
+#
+# In the latter case, e.g.
+#
+# @configuration('some-config.ini')
+# def test_something(self):
+#
+# There's actually another level of interior function, because the outer
+# decorator itself is getting called.  Here, any named configuration file is
+# additionally copied to the config.d directory, renaming it sequentionally to
+# something like 01_override.ini, with the numeric part incrementing
+# monotonically.
+#
+# The implementation is tricky because we want the call sites to be simple.
+def _wrapper(self, function, ini_files, *args, **kws):
+    start = 0
+    with ExitStack() as resources:
+        # Create the config.d directory and copy all the source ini files to
+        # this directory in sequential order, interpolating in the temporary
+        # tmp and var directories.
+        config_d = resources.enter_context(temporary_directory())
+        temp_tmpdir = resources.enter_context(temporary_directory())
+        temp_vardir = resources.enter_context(temporary_directory())
+        for ini_file in ini_files:
+            dst = os.path.join(config_d, '{:02d}_override.ini'.format(start))
+            start += 1
             template = resource_bytes(
-                'systemimage.tests.data', 'config_00.ini').decode('utf-8')
-            with atomic(ini_file) as fp:
+                'systemimage.tests.data', ini_file).decode('utf-8')
+            with atomic(dst) as fp:
                 print(template.format(tmpdir=temp_tmpdir,
                                       vardir=temp_vardir), file=fp)
-            config = Configuration(ini_file)
-            resources.enter_context(
-                patch('systemimage.config._config', config))
-            resources.enter_context(
-                patch('systemimage.device.check_output',
-                      return_value='nexus7'))
-            # Make sure the cache_partition and data_partition exist.
-            makedirs(config.updater.cache_partition)
-            makedirs(config.updater.data_partition)
-            # The method under test is allowed to specify some additional
-            # keyword arguments, in order to pass some variables in from the
-            # wrapper.
-            signature = inspect.signature(function)
-            if 'ini_file' in signature.parameters:
-                kws['ini_file'] = ini_file
-            return function(*args, **kws)
-    return wrapper
+        # Patch the global configuration object so that it can be used
+        # directly, which is good enough in most cases.  Also patch the bit of
+        # code that detects the device name.
+        config = Configuration(config_d)
+        resources.enter_context(
+            patch('systemimage.config._config', config))
+        resources.enter_context(
+            patch('systemimage.device.check_output',
+                  return_value='nexus7'))
+        # Make sure the cache_partition and data_partition exist.
+        makedirs(config.updater.cache_partition)
+        makedirs(config.updater.data_partition)
+        # The method under test is allowed to specify some additional
+        # keyword arguments, in order to pass some variables in from the
+        # wrapper.
+        signature = inspect.signature(function)
+        if 'config_d' in signature.parameters:
+            kws['config_d'] = config_d
+        if 'config' in signature.parameters:
+            kws['config'] = config
+        # Call the function with the given arguments and return the result.
+        return function(self, *args, **kws)
+
+
+def configuration(*args):
+    """Outer decorator which can be called or not at function definition time.
+
+    If called, the arguments are positional only, and name the test data .ini
+    files which are to be copied to config.d directory.  If none are given,
+    then 00.ini is used.
+    """
+    if len(args) == 1 and callable(args[0]):
+        # We assume this was the bare @configuration decorator flavor.
+        function = args[0]
+        inner = partialmethod(_wrapper, function, ('00.ini',))
+        return wraps(function)(inner)
+    else:
+        # We assume this was the called @configuration(...) decorator flavor,
+        # so create the actual decorator that wraps the _wrapper function.
+        def decorator(function):
+            inner = partialmethod(_wrapper, function, args)
+            return wraps(function)(inner)
+        return decorator
 
 
 def sign(filename, pubkey_ring):
@@ -259,6 +309,8 @@
         with.  This keyring must contain only one key, and its key id must
         exist in the master secret keyring.
     """
+    # filename could be a Path object.  For now, just str-ify it.
+    filename = str(filename)
     with ExitStack() as resources:
         home = resources.enter_context(temporary_directory())
         secring = data_path('master-secring.gpg')
@@ -278,7 +330,7 @@
 
 def copy(filename, todir, dst=None):
     src = data_path(filename)
-    dst = os.path.join(todir, filename if dst is None else dst)
+    dst = os.path.join(str(todir), filename if dst is None else dst)
     makedirs(os.path.dirname(dst))
     shutil.copy(src, dst)
 
@@ -405,21 +457,24 @@
         os.chmod(path, old_mode)
 
 
-def touch_build(version, timestamp=None):
+def touch_build(version, timestamp=None, use_config=None):
     # LP: #1220238 - assert that no old-style version numbers are being used.
     assert 0 <= version < (1 << 16), (
-        'old style version number: {}'.format(version))
-    with open(config.system.build_file, 'w', encoding='utf-8') as fp:
-        print(version, file=fp)
+        'Old style version number: {}'.format(version))
+    if use_config is None:
+        use_config = config
+    override = Path(use_config.config_d) / '99_build.ini'
+    with override.open('wt', encoding='utf-8') as fp:
+        print("""\
+[service]
+build_number: {}
+""".format(version), file=fp)
+    # We have to touch the mtimes for all the files in the config directory.
     if timestamp is not None:
         timestamp = int(timestamp)
-        os.utime(config.system.build_file, (timestamp, timestamp))
-        channel_ini = os.path.join(
-            os.path.dirname(config.config_file), 'channel.ini')
-        try:
-            os.utime(channel_ini, (timestamp, timestamp))
-        except FileNotFoundError:
-            pass
+        for path in Path(use_config.config_d).iterdir():
+            os.utime(str(path), (timestamp, timestamp))
+    use_config.reload()
 
 
 def write_bytes(path, size_in_mib):
@@ -497,6 +552,8 @@
         SystemImagePlugin.controller.set_mode(cert_pem='cert.pem')
 
     def setUp(self):
+        # Avoid circular imports.
+        from systemimage.state import State
         self._resources = ExitStack()
         self._state = State()
         try:

=== modified file 'systemimage/testing/nose.py'
--- systemimage/testing/nose.py	2014-09-17 22:34:27 +0000
+++ systemimage/testing/nose.py	2015-01-15 22:43:25 +0000
@@ -90,7 +90,7 @@
                        'Set the log file for the test run',
                        nargs=1)
         def set_dbus_loglevel(level):
-            self.log_level = 'info:{}'.format(level[0])
+            self.log_level = level[0]
         self.addOption(set_dbus_loglevel, 'M', 'loglevel',
                        'Set the systemimage.dbus log level',
                        nargs=1)
@@ -149,3 +149,8 @@
     ##     from systemimage.testing.helpers import debug
     ##     with debug() as dlog:
     ##         dlog('^^^^^', event.test)
+
+    def describeTest(self, event):
+        # This is fucked up.
+        if 'partial' in event.description:
+            event.description = event.description[:-73]

=== renamed file 'systemimage/tests/data/config_00.ini' => 'systemimage/tests/data/00.ini'
--- systemimage/tests/data/config_00.ini	2013-11-12 19:57:39 +0000
+++ systemimage/tests/data/00.ini	2015-01-15 22:43:25 +0000
@@ -12,7 +12,6 @@
 
 [system]
 timeout: 1s
-build_file: {tmpdir}/ubuntu-build
 tempdir: {tmpdir}/tmp
 logfile: {tmpdir}/client.log
 loglevel: info

=== renamed file 'systemimage/tests/data/config_03.ini' => 'systemimage/tests/data/01.ini'
--- systemimage/tests/data/config_03.ini	2014-09-11 18:12:50 +0000
+++ systemimage/tests/data/01.ini	2015-01-15 22:43:25 +0000
@@ -12,7 +12,6 @@
 
 [system]
 timeout: 1s
-build_file: {tmpdir}/ubuntu-build
 tempdir: {tmpdir}/tmp
 logfile: {logfile}
 loglevel: {loglevel}

=== added file 'systemimage/tests/data/api.channels_01.json'
--- systemimage/tests/data/api.channels_01.json	1970-01-01 00:00:00 +0000
+++ systemimage/tests/data/api.channels_01.json	2015-01-15 22:43:25 +0000
@@ -0,0 +1,13 @@
+{
+    "stable": {
+        "devices": {
+            "nexus7": {
+                "index": "/stable/nexus7/index.json",
+                "keyring": {
+                    "path": "/stable/nexus7/device-signing.tar.xz",
+                    "signature": "/stable/nexus7/device-signing.tar.xz.asc"
+                }
+            }
+        }
+    }
+}

=== added file 'systemimage/tests/data/api.index_01.json'
--- systemimage/tests/data/api.index_01.json	1970-01-01 00:00:00 +0000
+++ systemimage/tests/data/api.index_01.json	2015-01-15 22:43:25 +0000
@@ -0,0 +1,36 @@
+{
+    "global": {
+        "generated_at": "Thu Aug 01 08:01:00 UTC 2013"
+    },
+    "images": [
+        {
+            "description": "Full",
+            "files": [
+                {
+                    "checksum": "da70dfa4d9f95ac979f921e8e623358236313f334afcd06cddf8a5621cf6a1e9",
+                    "order": 3,
+                    "path": "/3/4/5.txt",
+                    "signature": "/3/4/5.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "b3a8e0e1f9ab1bfe3a36f231f676f78bb30a519d2b21e6c530c0eee8ebb4a5d0",
+                    "order": 1,
+                    "path": "/4/5/6.txt",
+                    "signature": "/4/5/6.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "97a6d21df7c51e8289ac1a8c026aaac143e15aa1957f54f42e30d8f8a85c3a55",
+                    "order": 2,
+                    "path": "/5/6/7.txt",
+                    "signature": "/5/6/7.txt.asc",
+                    "size": 104857600
+                }
+            ],
+            "type": "full",
+            "version": 1600,
+            "bootme": true
+        }
+    ]
+}

=== added file 'systemimage/tests/data/api.index_02.json'
--- systemimage/tests/data/api.index_02.json	1970-01-01 00:00:00 +0000
+++ systemimage/tests/data/api.index_02.json	2015-01-15 22:43:25 +0000
@@ -0,0 +1,251 @@
+{
+    "global": {
+        "generated_at": "Mon Apr 29 18:45:27 UTC 2013"
+    },
+    "images": [
+        {
+            "bootme": true,
+            "description": "Full A",
+            "files": [
+                {
+                    "checksum": "abc",
+                    "order": 1,
+                    "path": "/a/b/c.txt",
+                    "signature": "/a/b/c.txt.asc",
+                    "size": 104857600
+
+                },
+                {
+                    "checksum": "bcd",
+                    "order": 1,
+                    "path": "/b/c/d.txt",
+                    "signature": "/b/c/d.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "cde",
+                    "order": 1,
+                    "path": "/c/d/e.txt",
+                    "signature": "/c/d/e.txt.asc",
+                    "size": 104857600
+                }
+            ],
+            "type": "full",
+            "version": 1300
+        },
+        {
+            "base": 1300,
+            "bootme": true,
+            "description": "Delta A.1",
+            "files": [
+                {
+                    "checksum": "def",
+                    "order": 1,
+                    "path": "/d/e/f.txt",
+                    "signature": "/d/e/f.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "ef0",
+                    "order": 1,
+                    "path": "/e/f/0.txt",
+                    "signature": "/e/f/0.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "f01",
+                    "order": 1,
+                    "path": "/f/e/1.txt",
+                    "signature": "/f/e/1.txt.asc",
+                    "size": 104857600
+                }
+            ],
+            "type": "delta",
+            "version": 1301
+        },
+        {
+            "base": 1301,
+            "bootme": true,
+            "description": "Delta A.2",
+            "files": [
+                {
+                    "checksum": "012",
+                    "order": 1,
+                    "path": "/0/1/2.txt",
+                    "signature": "/0/1/2.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "123",
+                    "order": 1,
+                    "path": "/1/2/3.txt",
+                    "signature": "/1/2/3.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "234",
+                    "order": 1,
+                    "path": "/2/3/4.txt",
+                    "signature": "/2/3/4.txt.asc",
+                    "size": 104857600
+                }
+            ],
+            "type": "delta",
+            "version": 1304
+        },
+
+        {
+            "description": "Full B",
+            "description-en": "The full B",
+            "files": [
+                {
+                    "checksum": "da70dfa4d9f95ac979f921e8e623358236313f334afcd06cddf8a5621cf6a1e9",
+                    "order": 1,
+                    "path": "/3/4/5.txt",
+                    "signature": "/3/4/5.txt.asc",
+                    "size": 10000
+                },
+                {
+                    "checksum": "b3a8e0e1f9ab1bfe3a36f231f676f78bb30a519d2b21e6c530c0eee8ebb4a5d0",
+                    "order": 1,
+                    "path": "/4/5/6.txt",
+                    "signature": "/4/5/6.txt.asc",
+                    "size": 10001
+                },
+                {
+                    "checksum": "97a6d21df7c51e8289ac1a8c026aaac143e15aa1957f54f42e30d8f8a85c3a55",
+                    "order": 1,
+                    "path": "/5/6/7.txt",
+                    "signature": "/5/6/7.txt.asc",
+                    "size": 10002
+                }
+            ],
+            "type": "full",
+            "version": 1200
+        },
+        {
+            "base": 1200,
+            "description": "Delta B.1",
+            "description-en_US": "This is the delta B.1",
+            "description-xx": "XX This is the delta B.1",
+            "description-yy": "YY This is the delta B.1",
+            "description-yy_ZZ": "YY-ZZ This is the delta B.1",
+            "files": [
+                {
+                    "checksum": "cebe3d9d614ba5c19f633566104315854a11353a333bf96f16b5afa0e90abdc4",
+                    "order": 1,
+                    "path": "/6/7/8.txt",
+                    "signature": "/6/7/8.txt.asc",
+                    "size": 20000
+                },
+                {
+                    "checksum": "35a9e381b1a27567549b5f8a6f783c167ebf809f1c4d6a9e367240484d8ce281",
+                    "order": 1,
+                    "path": "/7/8/9.txt",
+                    "signature": "/7/8/9.txt.asc",
+                    "size": 20001
+                },
+                {
+                    "checksum": "6bd6c3f7808391e8b74f5c2d58810809eda5c134aaa7f1b27ddf4b445c421ac5",
+                    "order": 1,
+                    "path": "/8/9/a.txt",
+                    "signature": "/8/9/a.txt.asc",
+                    "size": 20002
+                }
+            ],
+            "type": "delta",
+            "version": 1201
+        },
+        {
+            "base": 1201,
+            "description": "Delta B.2",
+            "description-xx": "Oh delta, my delta",
+            "description-xx_CC": "This hyar is the delta B.2",
+            "files": [
+                {
+                    "checksum": "8c43d75d5b9f1aa9fc3fabb6b60b6c06553324352399a33febce95a1b588d1d6",
+                    "order": 1,
+                    "path": "/9/a/b.txt",
+                    "signature": "/9/a/b.txt.asc",
+                    "size": 30000
+                },
+                {
+                    "checksum": "20e796c128096d229ba89bf412a53c3151d170a409c2c8c1dd8e414087b7ffae",
+                    "order": 1,
+                    "path": "/f/e/d.txt",
+                    "signature": "/f/e/d.txt.asc",
+                    "size": 30001
+                },
+                {
+                    "checksum": "278238e8bafa4709c77aa723e168101acd6ee1fb9fcc1b6eca4762e5c7dad768",
+                    "order": 1,
+                    "path": "/e/d/c.txt",
+                    "signature": "/e/d/c.txt.asc",
+                    "size": 30002
+
+                }
+            ],
+            "type": "delta",
+            "version": 1304
+        },
+
+        {
+            "description": "Full C",
+            "files": [
+                {
+                    "checksum": "dcb",
+                    "order": 1,
+                    "path": "/d/c/b.txt",
+                    "signature": "/d/c/b.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "cba",
+                    "order": 1,
+                    "path": "/c/b/a.txt",
+                    "signature": "/c/b/a.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "ba9",
+                    "order": 1,
+                    "path": "/b/a/9.txt",
+                    "signature": "/b/a/9.txt.asc",
+                    "size": 104857600
+                }
+            ],
+            "type": "full",
+            "version": 1100
+        },
+        {
+            "base": 1100,
+            "description": "Delta C.1",
+            "files": [
+                {
+                    "checksum": "a98",
+                    "order": 1,
+                    "path": "/a/9/8.txt",
+                    "signature": "/a/9/8.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "987",
+                    "order": 1,
+                    "path": "/9/8/7.txt",
+                    "signature": "/9/8/7.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "876",
+                    "order": 1,
+                    "path": "/8/7/6.txt",
+                    "signature": "/8/7/6.txt.asc",
+                    "size": 838860800
+
+                }
+            ],
+            "type": "delta",
+            "version": 1303
+        }
+    ]
+}

=== added file 'systemimage/tests/data/candidates.index_01.json'
--- systemimage/tests/data/candidates.index_01.json	1970-01-01 00:00:00 +0000
+++ systemimage/tests/data/candidates.index_01.json	2015-01-15 22:43:25 +0000
@@ -0,0 +1,6 @@
+{
+    "global": {
+        "generated_at": "Mon Apr 29 18:45:27 UTC 2013"
+    },
+    "images": []
+}

=== added file 'systemimage/tests/data/candidates.index_02.json'
--- systemimage/tests/data/candidates.index_02.json	1970-01-01 00:00:00 +0000
+++ systemimage/tests/data/candidates.index_02.json	2015-01-15 22:43:25 +0000
@@ -0,0 +1,23 @@
+{
+    "global": {
+        "generated_at": "Mon Apr 29 18:45:27 UTC 2013"
+    },
+    "images": [
+        {
+            "bootme": true,
+            "description": "New full build 1",
+            "files": [],
+            "minversion": 600,
+            "type": "full",
+            "version": 1300
+        },
+        {
+            "bootme": true,
+            "description": "New full build 2",
+            "files": [],
+            "minversion": 1100,
+            "type": "full",
+            "version": 1400
+        }
+    ]
+}

=== renamed file 'systemimage/tests/data/index_05.json' => 'systemimage/tests/data/candidates.index_03.json'
=== renamed file 'systemimage/tests/data/index_03.json' => 'systemimage/tests/data/candidates.index_04.json'
=== renamed file 'systemimage/tests/data/index_04.json' => 'systemimage/tests/data/candidates.index_05.json'
=== renamed file 'systemimage/tests/data/index_06.json' => 'systemimage/tests/data/candidates.index_06.json'
=== renamed file 'systemimage/tests/data/index_07.json' => 'systemimage/tests/data/candidates.index_07.json'
=== added file 'systemimage/tests/data/candidates.index_08.json'
--- systemimage/tests/data/candidates.index_08.json	1970-01-01 00:00:00 +0000
+++ systemimage/tests/data/candidates.index_08.json	2015-01-15 22:43:25 +0000
@@ -0,0 +1,244 @@
+{
+    "global": {
+        "generated_at": "Mon Apr 29 18:45:27 UTC 2013"
+    },
+    "images": [
+        {
+            "bootme": true,
+            "description": "Full A",
+            "files": [
+                {
+                    "checksum": "abc",
+                    "order": 1,
+                    "path": "/a/b/c.txt",
+                    "signature": "/a/b/c.txt.asc",
+                    "size": 104857600
+
+                },
+                {
+                    "checksum": "bcd",
+                    "order": 1,
+                    "path": "/b/c/d.txt",
+                    "signature": "/b/c/d.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "cde",
+                    "order": 1,
+                    "path": "/c/d/e.txt",
+                    "signature": "/c/d/e.txt.asc",
+                    "size": 104857600
+                }
+            ],
+            "type": "full",
+            "version": 1300
+        },
+        {
+            "base": 1300,
+            "bootme": true,
+            "description": "Delta A.1",
+            "files": [
+                {
+                    "checksum": "def",
+                    "order": 1,
+                    "path": "/d/e/f.txt",
+                    "signature": "/d/e/f.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "ef0",
+                    "order": 1,
+                    "path": "/e/f/0.txt",
+                    "signature": "/e/f/0.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "f01",
+                    "order": 1,
+                    "path": "/f/e/1.txt",
+                    "signature": "/f/e/1.txt.asc",
+                    "size": 104857600
+                }
+            ],
+            "type": "delta",
+            "version": 1301
+        },
+        {
+            "base": 1301,
+            "bootme": true,
+            "description": "Delta A.2",
+            "files": [
+                {
+                    "checksum": "012",
+                    "order": 1,
+                    "path": "/0/1/2.txt",
+                    "signature": "/0/1/2.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "123",
+                    "order": 1,
+                    "path": "/1/2/3.txt",
+                    "signature": "/1/2/3.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "234",
+                    "order": 1,
+                    "path": "/2/3/4.txt",
+                    "signature": "/2/3/4.txt.asc",
+                    "size": 104857600
+                }
+            ],
+            "type": "delta",
+            "version": 1304
+        },
+
+        {
+            "description": "Full B",
+            "files": [
+                {
+                    "checksum": "345",
+                    "order": 1,
+                    "path": "/3/4/5.txt",
+                    "signature": "/3/4/5.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "456",
+                    "order": 1,
+                    "path": "/4/5/6.txt",
+                    "signature": "/4/5/6.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "567",
+                    "order": 1,
+                    "path": "/5/6/7.txt",
+                    "signature": "/5/6/7.txt.asc",
+                    "size": 104857600
+                }
+            ],
+            "type": "full",
+            "version": 1200
+        },
+        {
+            "base": 1200,
+            "description": "Delta B.1",
+            "files": [
+                {
+                    "checksum": "678",
+                    "order": 1,
+                    "path": "/6/7/8.txt",
+                    "signature": "/6/7/8.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "789",
+                    "order": 1,
+                    "path": "/7/8/9.txt",
+                    "signature": "/7/8/9.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "89a",
+                    "order": 1,
+                    "path": "/8/9/a.txt",
+                    "signature": "/8/9/a.txt.asc",
+                    "size": 104857600
+                }
+            ],
+            "type": "delta",
+            "version": 1201
+        },
+        {
+            "base": 1201,
+            "description": "Delta B.2",
+            "files": [
+                {
+                    "checksum": "9ab",
+                    "order": 1,
+                    "path": "/9/a/b.txt",
+                    "signature": "/9/a/b.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "fed",
+                    "order": 1,
+                    "path": "/f/e/d.txt",
+                    "signature": "/f/e/d.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "edc",
+                    "order": 1,
+                    "path": "/e/d/c.txt",
+                    "signature": "/e/d/c.txt.asc",
+                    "size": 209715200
+
+                }
+            ],
+            "type": "delta",
+            "version": 1304
+        },
+
+        {
+            "description": "Full C",
+            "files": [
+                {
+                    "checksum": "dcb",
+                    "order": 1,
+                    "path": "/d/c/b.txt",
+                    "signature": "/d/c/b.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "cba",
+                    "order": 1,
+                    "path": "/c/b/a.txt",
+                    "signature": "/c/b/a.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "ba9",
+                    "order": 1,
+                    "path": "/b/a/9.txt",
+                    "signature": "/b/a/9.txt.asc",
+                    "size": 104857600
+                }
+            ],
+            "type": "full",
+            "version": 1100
+        },
+        {
+            "base": 1100,
+            "description": "Delta C.1",
+            "files": [
+                {
+                    "checksum": "a98",
+                    "order": 1,
+                    "path": "/a/9/8.txt",
+                    "signature": "/a/9/8.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "987",
+                    "order": 1,
+                    "path": "/9/8/7.txt",
+                    "signature": "/9/8/7.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "876",
+                    "order": 1,
+                    "path": "/8/7/6.txt",
+                    "signature": "/8/7/6.txt.asc",
+                    "size": 838860800
+
+                }
+            ],
+            "type": "delta",
+            "version": 1303
+        }
+    ]
+}

=== renamed file 'systemimage/tests/data/index_11.json' => 'systemimage/tests/data/candidates.index_09.json'
=== added file 'systemimage/tests/data/candidates.index_10.json'
--- systemimage/tests/data/candidates.index_10.json	1970-01-01 00:00:00 +0000
+++ systemimage/tests/data/candidates.index_10.json	2015-01-15 22:43:25 +0000
@@ -0,0 +1,36 @@
+{
+    "global": {
+        "generated_at": "Thu Aug 01 08:01:00 UTC 2013"
+    },
+    "images": [
+        {
+            "description": "Full",
+            "files": [
+                {
+                    "checksum": "da70dfa4d9f95ac979f921e8e623358236313f334afcd06cddf8a5621cf6a1e9",
+                    "order": 3,
+                    "path": "/3/4/5.txt",
+                    "signature": "/3/4/5.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "b3a8e0e1f9ab1bfe3a36f231f676f78bb30a519d2b21e6c530c0eee8ebb4a5d0",
+                    "order": 1,
+                    "path": "/4/5/6.txt",
+                    "signature": "/4/5/6.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "97a6d21df7c51e8289ac1a8c026aaac143e15aa1957f54f42e30d8f8a85c3a55",
+                    "order": 2,
+                    "path": "/5/6/7.txt",
+                    "signature": "/5/6/7.txt.asc",
+                    "size": 104857600
+                }
+            ],
+            "type": "full",
+            "version": 1600,
+            "bootme": true
+        }
+    ]
+}

=== added file 'systemimage/tests/data/candidates.index_11.json'
--- systemimage/tests/data/candidates.index_11.json	1970-01-01 00:00:00 +0000
+++ systemimage/tests/data/candidates.index_11.json	2015-01-15 22:43:25 +0000
@@ -0,0 +1,37 @@
+{
+    "global": {
+        "generated_at": "Mon Apr 29 18:45:27 UTC 2013"
+    },
+    "images": [
+        {
+            "base": 100,
+            "description": "Delta",
+            "files": [
+                {
+                    "checksum": "da70dfa4d9f95ac979f921e8e623358236313f334afcd06cddf8a5621cf6a1e9",
+                    "order": 3,
+                    "path": "/3/4/5.txt",
+                    "signature": "/3/4/5.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "b3a8e0e1f9ab1bfe3a36f231f676f78bb30a519d2b21e6c530c0eee8ebb4a5d0",
+                    "order": 1,
+                    "path": "/4/5/6.txt",
+                    "signature": "/4/5/6.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "97a6d21df7c51e8289ac1a8c026aaac143e15aa1957f54f42e30d8f8a85c3a55",
+                    "order": 2,
+                    "path": "/5/6/7.txt",
+                    "signature": "/5/6/7.txt.asc",
+                    "size": 104857600
+                }
+            ],
+            "type": "delta",
+            "version": 1600,
+            "bootme": true
+        }
+    ]
+}

=== renamed file 'systemimage/tests/data/index_19.json' => 'systemimage/tests/data/candidates.index_12.json'
=== added file 'systemimage/tests/data/candidates.index_13.json'
--- systemimage/tests/data/candidates.index_13.json	1970-01-01 00:00:00 +0000
+++ systemimage/tests/data/candidates.index_13.json	2015-01-15 22:43:25 +0000
@@ -0,0 +1,244 @@
+{
+    "global": {
+        "generated_at": "Mon Apr 29 18:45:27 UTC 2013"
+    },
+    "images": [
+        {
+            "bootme": true,
+            "description": "Full A",
+            "files": [
+                {
+                    "checksum": "abc",
+                    "order": 1,
+                    "path": "/a/b/c.txt",
+                    "signature": "/a/b/c.txt.asc",
+                    "size": 104857600
+
+                },
+                {
+                    "checksum": "bcd",
+                    "order": 1,
+                    "path": "/b/c/d.txt",
+                    "signature": "/b/c/d.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "cde",
+                    "order": 1,
+                    "path": "/c/d/e.txt",
+                    "signature": "/c/d/e.txt.asc",
+                    "size": 104857600
+                }
+            ],
+            "type": "full",
+            "version": 300
+        },
+        {
+            "base": 300,
+            "bootme": true,
+            "description": "Delta A.1",
+            "files": [
+                {
+                    "checksum": "def",
+                    "order": 1,
+                    "path": "/d/e/f.txt",
+                    "signature": "/d/e/f.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "ef0",
+                    "order": 1,
+                    "path": "/e/f/0.txt",
+                    "signature": "/e/f/0.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "f01",
+                    "order": 1,
+                    "path": "/f/e/1.txt",
+                    "signature": "/f/e/1.txt.asc",
+                    "size": 104857600
+                }
+            ],
+            "type": "delta",
+            "version": 301
+        },
+        {
+            "base": 301,
+            "bootme": true,
+            "description": "Delta A.2",
+            "files": [
+                {
+                    "checksum": "012",
+                    "order": 1,
+                    "path": "/0/1/2.txt",
+                    "signature": "/0/1/2.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "123",
+                    "order": 1,
+                    "path": "/1/2/3.txt",
+                    "signature": "/1/2/3.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "234",
+                    "order": 1,
+                    "path": "/2/3/4.txt",
+                    "signature": "/2/3/4.txt.asc",
+                    "size": 104857600
+                }
+            ],
+            "type": "delta",
+            "version": 304
+        },
+
+        {
+            "description": "Full B",
+            "files": [
+                {
+                    "checksum": "345",
+                    "order": 1,
+                    "path": "/3/4/5.txt",
+                    "signature": "/3/4/5.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "456",
+                    "order": 1,
+                    "path": "/4/5/6.txt",
+                    "signature": "/4/5/6.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "567",
+                    "order": 1,
+                    "path": "/5/6/7.txt",
+                    "signature": "/5/6/7.txt.asc",
+                    "size": 104857600
+                }
+            ],
+            "type": "full",
+            "version": 200
+        },
+        {
+            "base": 200,
+            "description": "Delta B.1",
+            "files": [
+                {
+                    "checksum": "678",
+                    "order": 1,
+                    "path": "/6/7/8.txt",
+                    "signature": "/6/7/8.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "789",
+                    "order": 1,
+                    "path": "/7/8/9.txt",
+                    "signature": "/7/8/9.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "89a",
+                    "order": 1,
+                    "path": "/8/9/a.txt",
+                    "signature": "/8/9/a.txt.asc",
+                    "size": 104857600
+                }
+            ],
+            "type": "delta",
+            "version": 201
+        },
+        {
+            "base": 201,
+            "description": "Delta B.2",
+            "files": [
+                {
+                    "checksum": "9ab",
+                    "order": 1,
+                    "path": "/9/a/b.txt",
+                    "signature": "/9/a/b.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "fed",
+                    "order": 1,
+                    "path": "/f/e/d.txt",
+                    "signature": "/f/e/d.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "edc",
+                    "order": 1,
+                    "path": "/e/d/c.txt",
+                    "signature": "/e/d/c.txt.asc",
+                    "size": 209715200
+
+                }
+            ],
+            "type": "delta",
+            "version": 304
+        },
+
+        {
+            "description": "Full C",
+            "files": [
+                {
+                    "checksum": "dcb",
+                    "order": 1,
+                    "path": "/d/c/b.txt",
+                    "signature": "/d/c/b.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "cba",
+                    "order": 1,
+                    "path": "/c/b/a.txt",
+                    "signature": "/c/b/a.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "ba9",
+                    "order": 1,
+                    "path": "/b/a/9.txt",
+                    "signature": "/b/a/9.txt.asc",
+                    "size": 104857600
+                }
+            ],
+            "type": "full",
+            "version": 100
+        },
+        {
+            "base": 100,
+            "description": "Delta C.1",
+            "files": [
+                {
+                    "checksum": "a98",
+                    "order": 1,
+                    "path": "/a/9/8.txt",
+                    "signature": "/a/9/8.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "987",
+                    "order": 1,
+                    "path": "/9/8/7.txt",
+                    "signature": "/9/8/7.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "876",
+                    "order": 1,
+                    "path": "/8/7/6.txt",
+                    "signature": "/8/7/6.txt.asc",
+                    "size": 838860800
+
+                }
+            ],
+            "type": "delta",
+            "version": 303
+        }
+    ]
+}

=== added file 'systemimage/tests/data/channel.channels_01.json'
--- systemimage/tests/data/channel.channels_01.json	1970-01-01 00:00:00 +0000
+++ systemimage/tests/data/channel.channels_01.json	2015-01-15 22:43:25 +0000
@@ -0,0 +1,23 @@
+{
+    "daily": {
+        "devices": {
+            "nexus7": {
+                "index": "/daily/nexus7/index.json",
+                "keyring": {
+                    "path": "/daily/nexus7/device-keyring.tar.xz",
+                    "signature": "/daily/nexus7/device-keyring.tar.xz.asc"
+                }
+            },
+            "nexus4":{
+                "index": "/daily/nexus4/index.json"
+            }
+        }
+    },
+    "stable": {
+        "devices": {
+            "nexus7":{
+                "index": "/stable/nexus7/index.json"
+            }
+        }
+    }
+}

=== added file 'systemimage/tests/data/channel.channels_02.json'
--- systemimage/tests/data/channel.channels_02.json	1970-01-01 00:00:00 +0000
+++ systemimage/tests/data/channel.channels_02.json	2015-01-15 22:43:25 +0000
@@ -0,0 +1,38 @@
+{
+    "daily": {
+        "devices": {
+            "grouper": {
+                "index": "/daily/grouper/index.json"
+            },
+            "maguro": {
+                "index": "/daily/maguro/index.json"
+            },
+            "mako": {
+                "index": "/daily/mako/index.json"
+            },
+            "manta": {
+                "index": "/daily/manta/index.json"
+            }
+        }
+    },
+    "daily-proposed": {
+        "devices": {
+            "grouper": {
+                "index": "/daily-proposed/grouper/index.json",
+                "keyring": {
+                    "path": "/daily-proposed/grouper/device-signing.tar.xz",
+                    "signature": "/daily-proposed/grouper/device-signing.tar.xz.asc"
+                }
+            },
+            "maguro": {
+                "index": "/daily-proposed/maguro/index.json"
+            },
+            "mako": {
+                "index": "/daily-proposed/mako/index.json"
+            },
+            "manta": {
+                "index": "/daily-proposed/manta/index.json"
+            }
+        }
+    }
+}

=== added file 'systemimage/tests/data/channel.channels_03.json'
--- systemimage/tests/data/channel.channels_03.json	1970-01-01 00:00:00 +0000
+++ systemimage/tests/data/channel.channels_03.json	2015-01-15 22:43:25 +0000
@@ -0,0 +1,70 @@
+{
+    "13.10": {
+        "devices": {
+            "grouper": {
+                "index": "/13.10/grouper/index.json"
+            },
+            "maguro": {
+                "index": "/13.10/maguro/index.json"
+            },
+            "mako": {
+                "index": "/13.10/mako/index.json"
+            },
+            "manta": {
+                "index": "/13.10/manta/index.json"
+            }
+        }
+    },
+    "13.10-proposed": {
+        "devices": {
+            "grouper": {
+                "index": "/13.10-proposed/grouper/index.json"
+            },
+            "maguro": {
+                "index": "/13.10-proposed/maguro/index.json"
+            },
+            "mako": {
+                "index": "/13.10-proposed/mako/index.json"
+            },
+            "manta": {
+                "index": "/13.10-proposed/manta/index.json"
+            }
+        }
+    },
+    "14.04": {
+        "devices": {
+            "grouper": {
+                "index": "/14.04/grouper/index.json"
+            },
+            "maguro": {
+                "index": "/14.04/maguro/index.json"
+            },
+            "mako": {
+                "index": "/14.04/mako/index.json"
+            },
+            "manta": {
+                "index": "/14.04/manta/index.json"
+            }
+        }
+    },
+    "14.04-proposed": {
+        "devices": {
+            "grouper": {
+                "index": "/14.04-proposed/grouper/index.json",
+                "keyring": {
+                    "path": "/14.04-proposed/grouper/device-signing.tar.xz",
+                    "signature": "/14.04-proposed/grouper/device-signing.tar.xz.asc"
+                }
+            },
+            "maguro": {
+                "index": "/14.04-proposed/maguro/index.json"
+            },
+            "mako": {
+                "index": "/14.04-proposed/mako/index.json"
+            },
+            "manta": {
+                "index": "/14.04-proposed/manta/index.json"
+            }
+        }
+    }
+}

=== added file 'systemimage/tests/data/channel.channels_04.json'
--- systemimage/tests/data/channel.channels_04.json	1970-01-01 00:00:00 +0000
+++ systemimage/tests/data/channel.channels_04.json	2015-01-15 22:43:25 +0000
@@ -0,0 +1,56 @@
+{
+    "daily": {
+        "alias": "saucy",
+        "devices": {
+            "grouper": {
+                "index": "/daily/grouper/index.json"
+            },
+            "maguro": {
+                "index": "/daily/maguro/index.json"
+            },
+            "mako": {
+                "index": "/daily/mako/index.json"
+            },
+            "manta": {
+                "index": "/daily/manta/index.json"
+            }
+        }
+    },
+    "saucy": {
+        "devices": {
+            "grouper": {
+                "index": "/saucy/grouper/index.json"
+            },
+            "maguro": {
+                "index": "/saucy/maguro/index.json"
+            },
+            "mako": {
+                "index": "/saucy/mako/index.json"
+            },
+            "manta": {
+                "index": "/saucy/manta/index.json",
+                "keyring": {
+                    "path": "/saucy/manta/device-signing.tar.xz",
+                    "signature": "/saucy/manta/device-signing.tar.xz.asc"
+                }
+            }
+        }
+    },
+    "saucy-proposed": {
+        "hidden": true,
+        "devices": {
+            "grouper": {
+                "index": "/saucy-proposed/grouper/index.json"
+            },
+            "maguro": {
+                "index": "/saucy-proposed/maguro/index.json"
+            },
+            "mako": {
+                "index": "/saucy-proposed/mako/index.json"
+            },
+            "manta": {
+                "index": "/saucy-proposed/manta/index.json"
+            }
+        }
+    }
+}

=== added file 'systemimage/tests/data/channel.channels_05.json'
--- systemimage/tests/data/channel.channels_05.json	1970-01-01 00:00:00 +0000
+++ systemimage/tests/data/channel.channels_05.json	2015-01-15 22:43:25 +0000
@@ -0,0 +1,23 @@
+{
+    "daily": {
+        "devices": {
+            "nexus7": {
+                "index": "/daily/nexus7/index.json",
+                "keyring": {
+                    "path": "/daily/nexus7/device-keyring.tar.xz",
+                    "signature": "/daily/nexus7/device-keyring.tar.xz.asc"
+                }
+            },
+            "nexus4":{
+                "index": "/daily/nexus4/index.json"
+            }
+        }
+    },
+    "stable": {
+        "devices": {
+            "nexus7":{
+                "index": "/stable/nexus7/index.json"
+            }
+        }
+    }
+}

=== removed file 'systemimage/tests/data/channel_06.ini'
--- systemimage/tests/data/channel_06.ini	2014-08-08 20:25:17 +0000
+++ systemimage/tests/data/channel_06.ini	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-[service]
-base: localhost
-http_port: 8980
-https_port: 8943
-channel: daily
-build_number: 300
-channel_target: saucy
-device: shoephone

=== removed file 'systemimage/tests/data/channel_07.ini'
--- systemimage/tests/data/channel_07.ini	2014-08-08 20:25:17 +0000
+++ systemimage/tests/data/channel_07.ini	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-[service]
-base: localhost
-http_port: 8980
-https_port: 8943
-channel: daily
-build_number: 300
-channel_target: saucy
-device:

=== added file 'systemimage/tests/data/config.config_01.ini'
--- systemimage/tests/data/config.config_01.ini	1970-01-01 00:00:00 +0000
+++ systemimage/tests/data/config.config_01.ini	2015-01-15 22:43:25 +0000
@@ -0,0 +1,34 @@
+# Configuration file for specifying relatively static information about the
+# upgrade resolution process.
+
+[service]
+base: phablet.example.com
+http_port: 80
+https_port: 443
+channel: stable
+build_number: 0
+
+[system]
+timeout: 10s
+tempdir: /tmp
+logfile: /var/log/system-image/client.log
+loglevel: error
+settings_db: /var/lib/phablet/settings.db
+
+[gpg]
+archive_master: /etc/phablet/archive-master.tar.xz
+image_master: /etc/phablet/image-master.tar.xz
+image_signing: /var/lib/phablet/image-signing.tar.xz
+device_signing: /var/lib/phablet/device-signing.tar.xz
+
+[updater]
+cache_partition: {tmpdir}/android/cache
+data_partition: {vardir}/lib/phablet/updater
+
+[hooks]
+device: systemimage.device.SystemProperty
+scorer: systemimage.scores.WeightedScorer
+reboot: systemimage.reboot.Reboot
+
+[dbus]
+lifetime: 2m

=== renamed file 'systemimage/tests/data/config_10.ini' => 'systemimage/tests/data/config.config_02.ini'
--- systemimage/tests/data/config_10.ini	2014-09-11 18:12:50 +0000
+++ systemimage/tests/data/config.config_02.ini	2015-01-15 22:43:25 +0000
@@ -10,7 +10,6 @@
 
 [system]
 timeout: 10s
-build_file: /etc/ubuntu-build
 tempdir: /tmp
 logfile: /var/log/system-image/client.log
 loglevel: critical:debug
@@ -23,8 +22,8 @@
 device_signing: /var/lib/phablet/device-signing.tar.xz
 
 [updater]
-cache_partition: /android/cache
-data_partition: /var/lib/phablet/updater
+cache_partition: {tmpdir}/android/cache
+data_partition: {vardir}/lib/phablet/updater
 
 [hooks]
 device: systemimage.device.SystemProperty

=== renamed file 'systemimage/tests/data/config_02.ini' => 'systemimage/tests/data/config.config_03.ini'
--- systemimage/tests/data/config_02.ini	2013-11-12 19:57:39 +0000
+++ systemimage/tests/data/config.config_03.ini	2015-01-15 22:43:25 +0000
@@ -11,7 +11,6 @@
 
 [system]
 timeout: 10s
-build_file: /etc/ubuntu-build
 tempdir: /tmp
 logfile: /var/log/system-image/client.log
 loglevel: error
@@ -24,8 +23,8 @@
 device_signing: /var/lib/phablet/device-signing.tar.xz
 
 [updater]
-cache_partition: /android/cache
-data_partition: /var/lib/phablet/updater
+cache_partition: {tmpdir}/android/cache
+data_partition: {vardir}/lib/phablet/updater
 
 [hooks]
 device: systemimage.device.SystemProperty

=== added file 'systemimage/tests/data/config.config_04.ini'
--- systemimage/tests/data/config.config_04.ini	1970-01-01 00:00:00 +0000
+++ systemimage/tests/data/config.config_04.ini	2015-01-15 22:43:25 +0000
@@ -0,0 +1,36 @@
+# TEMPLATE configuration file for specifying relatively static information
+# about the upgrade resolution process.
+#
+# This is used by the DBus tests.
+
+[service]
+base: localhost
+http_port: 8980
+https_port: 8943
+channel: stable
+build_number: 0
+
+[system]
+timeout: 1s
+tempdir: {tmpdir}/tmp
+logfile: {logfile}
+loglevel: {loglevel}
+settings_db: {vardir}/settings.db
+
+[gpg]
+archive_master: {vardir}/etc/archive-master.tar.xz
+image_master: {vardir}/keyrings/image-master.tar.xz
+image_signing: {vardir}/keyrings/image-signing.tar.xz
+device_signing: {vardir}/keyrings/device-signing.tar.xz
+
+[updater]
+cache_partition: {vardir}/android/cache
+data_partition: {vardir}/ubuntu/cache
+
+[hooks]
+device: systemimage.testing.demo.TestingDevice
+scorer: systemimage.scores.WeightedScorer
+reboot: systemimage.reboot.Reboot
+
+[dbus]
+lifetime: 5m

=== renamed file 'systemimage/tests/data/config_05.ini' => 'systemimage/tests/data/config.config_05.ini'
--- systemimage/tests/data/config_05.ini	2014-02-25 21:46:55 +0000
+++ systemimage/tests/data/config.config_05.ini	2015-01-15 22:43:25 +0000
@@ -11,7 +11,6 @@
 
 [system]
 timeout: 10s
-build_file: /etc/ubuntu-build
 tempdir: /tmp
 logfile: /var/log/system-image/client.log
 loglevel: error
@@ -24,8 +23,8 @@
 device_signing: /var/lib/phablet/device-signing.tar.xz
 
 [updater]
-cache_partition: /android/cache
-data_partition: /var/lib/phablet/updater
+cache_partition: {tmpdir}/android/cache
+data_partition: {vardir}/lib/phablet/updater
 
 [hooks]
 device: systemimage.device.SystemProperty

=== renamed file 'systemimage/tests/data/config_06.ini' => 'systemimage/tests/data/config.config_06.ini'
--- systemimage/tests/data/config_06.ini	2014-02-25 21:46:55 +0000
+++ systemimage/tests/data/config.config_06.ini	2015-01-15 22:43:25 +0000
@@ -11,7 +11,6 @@
 
 [system]
 timeout: 10s
-build_file: /etc/ubuntu-build
 tempdir: /tmp
 logfile: /var/log/system-image/client.log
 loglevel: error
@@ -24,8 +23,8 @@
 device_signing: /var/lib/phablet/device-signing.tar.xz
 
 [updater]
-cache_partition: /android/cache
-data_partition: /var/lib/phablet/updater
+cache_partition: {tmpdir}/android/cache
+data_partition: {vardir}/lib/phablet/updater
 
 [hooks]
 device: systemimage.device.SystemProperty

=== renamed file 'systemimage/tests/data/config_07.ini' => 'systemimage/tests/data/config.config_07.ini'
--- systemimage/tests/data/config_07.ini	2014-02-25 21:46:55 +0000
+++ systemimage/tests/data/config.config_07.ini	2015-01-15 22:43:25 +0000
@@ -11,7 +11,6 @@
 
 [system]
 timeout: 10s
-build_file: /etc/ubuntu-build
 tempdir: /tmp
 logfile: /var/log/system-image/client.log
 loglevel: error

=== renamed file 'systemimage/tests/data/config_08.ini' => 'systemimage/tests/data/config.config_08.ini'
--- systemimage/tests/data/config_08.ini	2014-02-26 16:11:09 +0000
+++ systemimage/tests/data/config.config_08.ini	2015-01-15 22:43:25 +0000
@@ -11,7 +11,6 @@
 
 [system]
 timeout: 10s
-build_file: /etc/ubuntu-build
 tempdir: /tmp
 logfile: /var/log/system-image/client.log
 loglevel: error

=== renamed file 'systemimage/tests/data/channel_02.ini' => 'systemimage/tests/data/config.config_09.ini'
--- systemimage/tests/data/channel_02.ini	2014-02-26 16:11:09 +0000
+++ systemimage/tests/data/config.config_09.ini	2015-01-15 22:43:25 +0000
@@ -5,8 +5,5 @@
 channel: proposed
 build_number: 833
 
-[system]
-build_file: /etc/path/to/alternative/build-file
-
 [dbus]
 lifetime: 1h

=== renamed file 'systemimage/tests/data/config_09.ini' => 'systemimage/tests/data/config.config_10.ini'
--- systemimage/tests/data/config_09.ini	2014-08-08 00:58:41 +0000
+++ systemimage/tests/data/config.config_10.ini	2015-01-15 22:43:25 +0000
@@ -15,8 +15,8 @@
 device_signing: /var/lib/phablet/device-signing.tar.xz
 
 [updater]
-cache_partition: /android/cache
-data_partition: /var/lib/phablet/updater
+cache_partition: {tmpdir}/android/cache
+data_partition: {vardir}/lib/phablet/updater
 
 [hooks]
 device: systemimage.device.SystemProperty

=== removed file 'systemimage/tests/data/config_04.ini'
--- systemimage/tests/data/config_04.ini	2013-11-12 19:57:39 +0000
+++ systemimage/tests/data/config_04.ini	1970-01-01 00:00:00 +0000
@@ -1,36 +0,0 @@
-# Configuration file for specifying relatively static information about the
-# upgrade resolution process.
-
-[service]
-base: phablet.example.com
-# Non-standard ports
-http_port: 8080
-https_port: 80443
-channel: stable
-build_number: 0
-
-[system]
-timeout: 30s
-build_file: {tmpdir}/ubuntu-build
-tempdir: {tmpdir}/tmp
-logfile: {vardir}/client.log
-loglevel: info
-settings_db: {vardir}/settings.db
-
-[gpg]
-archive_master: {vardir}/etc/archive-master.tar.xz
-image_master: {vardir}/keyrings/image-master.tar.xz
-image_signing: {vardir}/keyrings/image-signing.tar.xz
-device_signing: {vardir}/keyrings/device-signing.tar.xz
-
-[updater]
-cache_partition: {vardir}/android/cache
-data_partition: {vardir}/ubuntu/cache
-
-[hooks]
-device: systemimage.device.SystemProperty
-scorer: systemimage.scores.WeightedScorer
-reboot: systemimage.reboot.Reboot
-
-[dbus]
-lifetime: 3s

=== renamed file 'systemimage/tests/data/channels_06.json' => 'systemimage/tests/data/dbus.channels_01.json'
=== renamed file 'systemimage/tests/data/index_13.json' => 'systemimage/tests/data/dbus.index_01.json'
=== renamed file 'systemimage/tests/data/index_18.json' => 'systemimage/tests/data/dbus.index_02.json'
=== added file 'systemimage/tests/data/dbus.index_03.json'
--- systemimage/tests/data/dbus.index_03.json	1970-01-01 00:00:00 +0000
+++ systemimage/tests/data/dbus.index_03.json	2015-01-15 22:43:25 +0000
@@ -0,0 +1,36 @@
+{
+    "global": {
+        "generated_at": "Thu Aug 01 08:01:00 UTC 2013"
+    },
+    "images": [
+        {
+            "description": "Full",
+            "files": [
+                {
+                    "checksum": "da70dfa4d9f95ac979f921e8e623358236313f334afcd06cddf8a5621cf6a1e9",
+                    "order": 3,
+                    "path": "/3/4/5.txt",
+                    "signature": "/3/4/5.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "b3a8e0e1f9ab1bfe3a36f231f676f78bb30a519d2b21e6c530c0eee8ebb4a5d0",
+                    "order": 1,
+                    "path": "/4/5/6.txt",
+                    "signature": "/4/5/6.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "97a6d21df7c51e8289ac1a8c026aaac143e15aa1957f54f42e30d8f8a85c3a55",
+                    "order": 2,
+                    "path": "/5/6/5.txt",
+                    "signature": "/5/6/5.txt.asc",
+                    "size": 104857600
+                }
+            ],
+            "type": "full",
+            "version": 1600,
+            "bootme": true
+        }
+    ]
+}

=== renamed file 'systemimage/tests/data/index_24.json' => 'systemimage/tests/data/dbus.index_04.json'
=== renamed file 'systemimage/tests/data/index_25.json' => 'systemimage/tests/data/dbus.index_05.json'
=== added file 'systemimage/tests/data/download.index_01.json'
--- systemimage/tests/data/download.index_01.json	1970-01-01 00:00:00 +0000
+++ systemimage/tests/data/download.index_01.json	2015-01-15 22:43:25 +0000
@@ -0,0 +1,6 @@
+{
+    "global": {
+        "generated_at": "Mon Apr 29 18:45:27 UTC 2013"
+    },
+    "images": []
+}

=== added file 'systemimage/tests/data/gpg.channels_01.json'
--- systemimage/tests/data/gpg.channels_01.json	1970-01-01 00:00:00 +0000
+++ systemimage/tests/data/gpg.channels_01.json	2015-01-15 22:43:25 +0000
@@ -0,0 +1,23 @@
+{
+    "daily": {
+        "devices": {
+            "nexus7": {
+                "index": "/daily/nexus7/index.json",
+                "keyring": {
+                    "path": "/daily/nexus7/device-keyring.tar.xz",
+                    "signature": "/daily/nexus7/device-keyring.tar.xz.asc"
+                }
+            },
+            "nexus4":{
+                "index": "/daily/nexus4/index.json"
+            }
+        }
+    },
+    "stable": {
+        "devices": {
+            "nexus7":{
+                "index": "/stable/nexus7/index.json"
+            }
+        }
+    }
+}

=== added file 'systemimage/tests/data/helpers.config_01.ini'
--- systemimage/tests/data/helpers.config_01.ini	1970-01-01 00:00:00 +0000
+++ systemimage/tests/data/helpers.config_01.ini	2015-01-15 22:43:25 +0000
@@ -0,0 +1,7 @@
+[service]
+base: systum-imaje.ubuntu.com
+http_port: 88
+https_port: 89
+channel: proposed
+build_number: 1833
+version_detail: ubuntu=123,mako=456,custom=789

=== added file 'systemimage/tests/data/helpers.config_02.ini'
--- systemimage/tests/data/helpers.config_02.ini	1970-01-01 00:00:00 +0000
+++ systemimage/tests/data/helpers.config_02.ini	2015-01-15 22:43:25 +0000
@@ -0,0 +1,6 @@
+[service]
+base: systum-imaje.ubuntu.com
+http_port: 88
+https_port: 89
+channel: proposed
+build_number: 1833

=== added file 'systemimage/tests/data/index.channels_01.json'
--- systemimage/tests/data/index.channels_01.json	1970-01-01 00:00:00 +0000
+++ systemimage/tests/data/index.channels_01.json	2015-01-15 22:43:25 +0000
@@ -0,0 +1,9 @@
+{
+    "stable": {
+        "devices": {
+            "nexus7":{
+                "index": "/stable/nexus7/index.json"
+            }
+        }
+    }
+}

=== added file 'systemimage/tests/data/index.channels_02.json'
--- systemimage/tests/data/index.channels_02.json	1970-01-01 00:00:00 +0000
+++ systemimage/tests/data/index.channels_02.json	2015-01-15 22:43:25 +0000
@@ -0,0 +1,13 @@
+{
+    "stable": {
+        "devices": {
+            "nexus7":{
+                "index": "/stable/nexus7/index.json",
+                "keyring": {
+                    "path": "stable/nexus7/device.tar.xz",
+                    "signature": "stable/nexus7/device.tar.xz.asc"
+                }
+            }
+        }
+    }
+}

=== renamed file 'systemimage/tests/data/channels_04.json' => 'systemimage/tests/data/index.channels_03.json'
=== renamed file 'systemimage/tests/data/channels_05.json' => 'systemimage/tests/data/index.channels_04.json'
=== added file 'systemimage/tests/data/index.channels_05.json'
--- systemimage/tests/data/index.channels_05.json	1970-01-01 00:00:00 +0000
+++ systemimage/tests/data/index.channels_05.json	2015-01-15 22:43:25 +0000
@@ -0,0 +1,9 @@
+{
+    "stable": {
+        "devices": {
+            "nexus7":{
+                "index": "/stable/nexus7/index.json"
+            }
+        }
+    }
+}

=== added file 'systemimage/tests/data/index.index_01.json'
--- systemimage/tests/data/index.index_01.json	1970-01-01 00:00:00 +0000
+++ systemimage/tests/data/index.index_01.json	2015-01-15 22:43:25 +0000
@@ -0,0 +1,251 @@
+{
+    "global": {
+        "generated_at": "Mon Apr 29 18:45:27 UTC 2013"
+    },
+    "images": [
+        {
+            "bootme": true,
+            "description": "Full A",
+            "files": [
+                {
+                    "checksum": "abc",
+                    "order": 1,
+                    "path": "/a/b/c.txt",
+                    "signature": "/a/b/c.txt.asc",
+                    "size": 104857600
+
+                },
+                {
+                    "checksum": "bcd",
+                    "order": 1,
+                    "path": "/b/c/d.txt",
+                    "signature": "/b/c/d.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "cde",
+                    "order": 1,
+                    "path": "/c/d/e.txt",
+                    "signature": "/c/d/e.txt.asc",
+                    "size": 104857600
+                }
+            ],
+            "type": "full",
+            "version": 1300
+        },
+        {
+            "base": 1300,
+            "bootme": true,
+            "description": "Delta A.1",
+            "files": [
+                {
+                    "checksum": "def",
+                    "order": 1,
+                    "path": "/d/e/f.txt",
+                    "signature": "/d/e/f.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "ef0",
+                    "order": 1,
+                    "path": "/e/f/0.txt",
+                    "signature": "/e/f/0.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "f01",
+                    "order": 1,
+                    "path": "/f/e/1.txt",
+                    "signature": "/f/e/1.txt.asc",
+                    "size": 104857600
+                }
+            ],
+            "type": "delta",
+            "version": 1301
+        },
+        {
+            "base": 1301,
+            "bootme": true,
+            "description": "Delta A.2",
+            "files": [
+                {
+                    "checksum": "012",
+                    "order": 1,
+                    "path": "/0/1/2.txt",
+                    "signature": "/0/1/2.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "123",
+                    "order": 1,
+                    "path": "/1/2/3.txt",
+                    "signature": "/1/2/3.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "234",
+                    "order": 1,
+                    "path": "/2/3/4.txt",
+                    "signature": "/2/3/4.txt.asc",
+                    "size": 104857600
+                }
+            ],
+            "type": "delta",
+            "version": 1304
+        },
+
+        {
+            "description": "Full B",
+            "description-en": "The full B",
+            "files": [
+                {
+                    "checksum": "da70dfa4d9f95ac979f921e8e623358236313f334afcd06cddf8a5621cf6a1e9",
+                    "order": 1,
+                    "path": "/3/4/5.txt",
+                    "signature": "/3/4/5.txt.asc",
+                    "size": 10000
+                },
+                {
+                    "checksum": "b3a8e0e1f9ab1bfe3a36f231f676f78bb30a519d2b21e6c530c0eee8ebb4a5d0",
+                    "order": 1,
+                    "path": "/4/5/6.txt",
+                    "signature": "/4/5/6.txt.asc",
+                    "size": 10001
+                },
+                {
+                    "checksum": "97a6d21df7c51e8289ac1a8c026aaac143e15aa1957f54f42e30d8f8a85c3a55",
+                    "order": 1,
+                    "path": "/5/6/7.txt",
+                    "signature": "/5/6/7.txt.asc",
+                    "size": 10002
+                }
+            ],
+            "type": "full",
+            "version": 1200
+        },
+        {
+            "base": 1200,
+            "description": "Delta B.1",
+            "description-en_US": "This is the delta B.1",
+            "description-xx": "XX This is the delta B.1",
+            "description-yy": "YY This is the delta B.1",
+            "description-yy_ZZ": "YY-ZZ This is the delta B.1",
+            "files": [
+                {
+                    "checksum": "cebe3d9d614ba5c19f633566104315854a11353a333bf96f16b5afa0e90abdc4",
+                    "order": 1,
+                    "path": "/6/7/8.txt",
+                    "signature": "/6/7/8.txt.asc",
+                    "size": 20000
+                },
+                {
+                    "checksum": "35a9e381b1a27567549b5f8a6f783c167ebf809f1c4d6a9e367240484d8ce281",
+                    "order": 1,
+                    "path": "/7/8/9.txt",
+                    "signature": "/7/8/9.txt.asc",
+                    "size": 20001
+                },
+                {
+                    "checksum": "6bd6c3f7808391e8b74f5c2d58810809eda5c134aaa7f1b27ddf4b445c421ac5",
+                    "order": 1,
+                    "path": "/8/9/a.txt",
+                    "signature": "/8/9/a.txt.asc",
+                    "size": 20002
+                }
+            ],
+            "type": "delta",
+            "version": 1201
+        },
+        {
+            "base": 1201,
+            "description": "Delta B.2",
+            "description-xx": "Oh delta, my delta",
+            "description-xx_CC": "This hyar is the delta B.2",
+            "files": [
+                {
+                    "checksum": "8c43d75d5b9f1aa9fc3fabb6b60b6c06553324352399a33febce95a1b588d1d6",
+                    "order": 1,
+                    "path": "/9/a/b.txt",
+                    "signature": "/9/a/b.txt.asc",
+                    "size": 30000
+                },
+                {
+                    "checksum": "20e796c128096d229ba89bf412a53c3151d170a409c2c8c1dd8e414087b7ffae",
+                    "order": 1,
+                    "path": "/f/e/d.txt",
+                    "signature": "/f/e/d.txt.asc",
+                    "size": 30001
+                },
+                {
+                    "checksum": "278238e8bafa4709c77aa723e168101acd6ee1fb9fcc1b6eca4762e5c7dad768",
+                    "order": 1,
+                    "path": "/e/d/c.txt",
+                    "signature": "/e/d/c.txt.asc",
+                    "size": 30002
+
+                }
+            ],
+            "type": "delta",
+            "version": 1304
+        },
+
+        {
+            "description": "Full C",
+            "files": [
+                {
+                    "checksum": "dcb",
+                    "order": 1,
+                    "path": "/d/c/b.txt",
+                    "signature": "/d/c/b.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "cba",
+                    "order": 1,
+                    "path": "/c/b/a.txt",
+                    "signature": "/c/b/a.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "ba9",
+                    "order": 1,
+                    "path": "/b/a/9.txt",
+                    "signature": "/b/a/9.txt.asc",
+                    "size": 104857600
+                }
+            ],
+            "type": "full",
+            "version": 1100
+        },
+        {
+            "base": 1100,
+            "description": "Delta C.1",
+            "files": [
+                {
+                    "checksum": "a98",
+                    "order": 1,
+                    "path": "/a/9/8.txt",
+                    "signature": "/a/9/8.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "987",
+                    "order": 1,
+                    "path": "/9/8/7.txt",
+                    "signature": "/9/8/7.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "876",
+                    "order": 1,
+                    "path": "/8/7/6.txt",
+                    "signature": "/8/7/6.txt.asc",
+                    "size": 838860800
+
+                }
+            ],
+            "type": "delta",
+            "version": 1303
+        }
+    ]
+}

=== renamed file 'systemimage/tests/data/index_01.json' => 'systemimage/tests/data/index.index_02.json'
=== renamed file 'systemimage/tests/data/index_02.json' => 'systemimage/tests/data/index.index_03.json'
=== added file 'systemimage/tests/data/index.index_04.json'
--- systemimage/tests/data/index.index_04.json	1970-01-01 00:00:00 +0000
+++ systemimage/tests/data/index.index_04.json	2015-01-15 22:43:25 +0000
@@ -0,0 +1,244 @@
+{
+    "global": {
+        "generated_at": "Mon Apr 29 18:45:27 UTC 2013"
+    },
+    "images": [
+        {
+            "bootme": true,
+            "description": "Full A",
+            "files": [
+                {
+                    "checksum": "abc",
+                    "order": 1,
+                    "path": "/a/b/c.txt",
+                    "signature": "/a/b/c.txt.asc",
+                    "size": 104857600
+
+                },
+                {
+                    "checksum": "bcd",
+                    "order": 1,
+                    "path": "/b/c/d.txt",
+                    "signature": "/b/c/d.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "cde",
+                    "order": 1,
+                    "path": "/c/d/e.txt",
+                    "signature": "/c/d/e.txt.asc",
+                    "size": 104857600
+                }
+            ],
+            "type": "full",
+            "version": 1300
+        },
+        {
+            "base": 1300,
+            "bootme": true,
+            "description": "Delta A.1",
+            "files": [
+                {
+                    "checksum": "def",
+                    "order": 1,
+                    "path": "/d/e/f.txt",
+                    "signature": "/d/e/f.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "ef0",
+                    "order": 1,
+                    "path": "/e/f/0.txt",
+                    "signature": "/e/f/0.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "f01",
+                    "order": 1,
+                    "path": "/f/e/1.txt",
+                    "signature": "/f/e/1.txt.asc",
+                    "size": 104857600
+                }
+            ],
+            "type": "delta",
+            "version": 1301
+        },
+        {
+            "base": 1301,
+            "bootme": true,
+            "description": "Delta A.2",
+            "files": [
+                {
+                    "checksum": "012",
+                    "order": 1,
+                    "path": "/0/1/2.txt",
+                    "signature": "/0/1/2.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "123",
+                    "order": 1,
+                    "path": "/1/2/3.txt",
+                    "signature": "/1/2/3.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "234",
+                    "order": 1,
+                    "path": "/2/3/4.txt",
+                    "signature": "/2/3/4.txt.asc",
+                    "size": 104857600
+                }
+            ],
+            "type": "delta",
+            "version": 1304
+        },
+
+        {
+            "description": "Full B",
+            "files": [
+                {
+                    "checksum": "345",
+                    "order": 1,
+                    "path": "/3/4/5.txt",
+                    "signature": "/3/4/5.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "456",
+                    "order": 1,
+                    "path": "/4/5/6.txt",
+                    "signature": "/4/5/6.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "567",
+                    "order": 1,
+                    "path": "/5/6/7.txt",
+                    "signature": "/5/6/7.txt.asc",
+                    "size": 104857600
+                }
+            ],
+            "type": "full",
+            "version": 1200
+        },
+        {
+            "base": 1200,
+            "description": "Delta B.1",
+            "files": [
+                {
+                    "checksum": "678",
+                    "order": 1,
+                    "path": "/6/7/8.txt",
+                    "signature": "/6/7/8.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "789",
+                    "order": 1,
+                    "path": "/7/8/9.txt",
+                    "signature": "/7/8/9.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "89a",
+                    "order": 1,
+                    "path": "/8/9/a.txt",
+                    "signature": "/8/9/a.txt.asc",
+                    "size": 104857600
+                }
+            ],
+            "type": "delta",
+            "version": 1201
+        },
+        {
+            "base": 1201,
+            "description": "Delta B.2",
+            "files": [
+                {
+                    "checksum": "9ab",
+                    "order": 1,
+                    "path": "/9/a/b.txt",
+                    "signature": "/9/a/b.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "fed",
+                    "order": 1,
+                    "path": "/f/e/d.txt",
+                    "signature": "/f/e/d.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "edc",
+                    "order": 1,
+                    "path": "/e/d/c.txt",
+                    "signature": "/e/d/c.txt.asc",
+                    "size": 209715200
+
+                }
+            ],
+            "type": "delta",
+            "version": 1304
+        },
+
+        {
+            "description": "Full C",
+            "files": [
+                {
+                    "checksum": "dcb",
+                    "order": 1,
+                    "path": "/d/c/b.txt",
+                    "signature": "/d/c/b.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "cba",
+                    "order": 1,
+                    "path": "/c/b/a.txt",
+                    "signature": "/c/b/a.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "ba9",
+                    "order": 1,
+                    "path": "/b/a/9.txt",
+                    "signature": "/b/a/9.txt.asc",
+                    "size": 104857600
+                }
+            ],
+            "type": "full",
+            "version": 1100
+        },
+        {
+            "base": 1100,
+            "description": "Delta C.1",
+            "files": [
+                {
+                    "checksum": "a98",
+                    "order": 1,
+                    "path": "/a/9/8.txt",
+                    "signature": "/a/9/8.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "987",
+                    "order": 1,
+                    "path": "/9/8/7.txt",
+                    "signature": "/9/8/7.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "876",
+                    "order": 1,
+                    "path": "/8/7/6.txt",
+                    "signature": "/8/7/6.txt.asc",
+                    "size": 838860800
+
+                }
+            ],
+            "type": "delta",
+            "version": 1303
+        }
+    ]
+}

=== renamed file 'systemimage/tests/data/sprint_nexus7_index_01.json' => 'systemimage/tests/data/index.index_05.json'
=== removed file 'systemimage/tests/data/index_26.json'
--- systemimage/tests/data/index_26.json	2014-10-21 20:06:07 +0000
+++ systemimage/tests/data/index_26.json	1970-01-01 00:00:00 +0000
@@ -1,245 +0,0 @@
-{
-    "global": {
-        "generated_at": "Mon Apr 29 18:45:27 UTC 2013"
-    },
-    "images": [
-        {
-            "bootme": true,
-            "description": "Full A",
-            "files": [
-                {
-                    "checksum": "abc",
-                    "order": 1,
-                    "path": "/a/b/c.txt",
-                    "signature": "/a/b/c.txt.asc",
-                    "size": 104857600
-
-                },
-                {
-                    "checksum": "bcd",
-                    "order": 1,
-                    "path": "/b/c/d.txt",
-                    "signature": "/b/c/d.txt.asc",
-                    "size": 104857600
-                },
-                {
-                    "checksum": "cde",
-                    "order": 1,
-                    "path": "/c/d/e.txt",
-                    "signature": "/c/d/e.txt.asc",
-                    "size": 104857600
-                }
-            ],
-            "type": "full",
-            "version": 300
-        },
-        {
-            "base": 300,
-            "bootme": true,
-            "description": "Delta A.1",
-            "files": [
-                {
-                    "checksum": "def",
-                    "order": 1,
-                    "path": "/d/e/f.txt",
-                    "signature": "/d/e/f.txt.asc",
-                    "size": 104857600
-                },
-                {
-                    "checksum": "ef0",
-                    "order": 1,
-                    "path": "/e/f/0.txt",
-                    "signature": "/e/f/0.txt.asc",
-                    "size": 104857600
-                },
-                {
-                    "checksum": "f01",
-                    "order": 1,
-                    "path": "/f/e/1.txt",
-                    "signature": "/f/e/1.txt.asc",
-                    "size": 104857600
-                }
-            ],
-            "type": "delta",
-            "version": 301
-        },
-        {
-            "base": 301,
-            "bootme": true,
-            "description": "Delta A.2",
-            "files": [
-                {
-                    "checksum": "012",
-                    "order": 1,
-                    "path": "/0/1/2.txt",
-                    "signature": "/0/1/2.txt.asc",
-                    "size": 104857600
-                },
-                {
-                    "checksum": "123",
-                    "order": 1,
-                    "path": "/1/2/3.txt",
-                    "signature": "/1/2/3.txt.asc",
-                    "size": 104857600
-                },
-                {
-                    "checksum": "234",
-                    "order": 1,
-                    "path": "/2/3/4.txt",
-                    "signature": "/2/3/4.txt.asc",
-                    "size": 104857600
-                }
-            ],
-            "type": "delta",
-            "version": 304
-        },
-
-        {
-            "description": "Full B",
-            "files": [
-                {
-                    "checksum": "345",
-                    "order": 1,
-                    "path": "/3/4/5.txt",
-                    "signature": "/3/4/5.txt.asc",
-                    "size": 104857600
-                },
-                {
-                    "checksum": "456",
-                    "order": 1,
-                    "path": "/4/5/6.txt",
-                    "signature": "/4/5/6.txt.asc",
-                    "size": 104857600
-                },
-                {
-                    "checksum": "567",
-                    "order": 1,
-                    "path": "/5/6/7.txt",
-                    "signature": "/5/6/7.txt.asc",
-                    "size": 104857600
-                }
-            ],
-            "type": "full",
-            "version": 200
-        },
-        {
-            "base": 200,
-            "description": "Delta B.1",
-            "files": [
-                {
-                    "checksum": "678",
-                    "order": 1,
-                    "path": "/6/7/8.txt",
-                    "signature": "/6/7/8.txt.asc",
-                    "size": 104857600
-                },
-                {
-                    "checksum": "789",
-                    "order": 1,
-                    "path": "/7/8/9.txt",
-                    "signature": "/7/8/9.txt.asc",
-                    "size": 104857600
-                },
-                {
-                    "checksum": "89a",
-                    "order": 1,
-                    "path": "/8/9/a.txt",
-                    "signature": "/8/9/a.txt.asc",
-                    "size": 104857600
-                }
-            ],
-            "type": "delta",
-            "version": 201
-        },
-        {
-            "base": 201,
-            "description": "Delta B.2",
-            "files": [
-                {
-                    "checksum": "9ab",
-                    "order": 1,
-                    "path": "/9/a/b.txt",
-                    "signature": "/9/a/b.txt.asc",
-                    "size": 104857600
-                },
-                {
-                    "checksum": "fed",
-                    "order": 1,
-                    "path": "/f/e/d.txt",
-                    "signature": "/f/e/d.txt.asc",
-                    "size": 104857600
-                },
-                {
-                    "checksum": "edc",
-                    "order": 1,
-                    "path": "/e/d/c.txt",
-                    "signature": "/e/d/c.txt.asc",
-                    "size": 209715200
-
-                }
-            ],
-            "type": "delta",
-            "version": 304,
-            "phased-percentage": 0
-        },
-
-        {
-            "description": "Full C",
-            "files": [
-                {
-                    "checksum": "dcb",
-                    "order": 1,
-                    "path": "/d/c/b.txt",
-                    "signature": "/d/c/b.txt.asc",
-                    "size": 104857600
-                },
-                {
-                    "checksum": "cba",
-                    "order": 1,
-                    "path": "/c/b/a.txt",
-                    "signature": "/c/b/a.txt.asc",
-                    "size": 104857600
-                },
-                {
-                    "checksum": "ba9",
-                    "order": 1,
-                    "path": "/b/a/9.txt",
-                    "signature": "/b/a/9.txt.asc",
-                    "size": 104857600
-                }
-            ],
-            "type": "full",
-            "version": 100
-        },
-        {
-            "base": 100,
-            "description": "Delta C.1",
-            "files": [
-                {
-                    "checksum": "a98",
-                    "order": 1,
-                    "path": "/a/9/8.txt",
-                    "signature": "/a/9/8.txt.asc",
-                    "size": 104857600
-                },
-                {
-                    "checksum": "987",
-                    "order": 1,
-                    "path": "/9/8/7.txt",
-                    "signature": "/9/8/7.txt.asc",
-                    "size": 104857600
-                },
-                {
-                    "checksum": "876",
-                    "order": 1,
-                    "path": "/8/7/6.txt",
-                    "signature": "/8/7/6.txt.asc",
-                    "size": 838860800
-
-                }
-            ],
-            "type": "delta",
-            "version": 303
-        }
-    ]
-}

=== added file 'systemimage/tests/data/main.channels_01.json'
--- systemimage/tests/data/main.channels_01.json	1970-01-01 00:00:00 +0000
+++ systemimage/tests/data/main.channels_01.json	2015-01-15 22:43:25 +0000
@@ -0,0 +1,13 @@
+{
+    "stable": {
+        "devices": {
+            "nexus7": {
+                "index": "/stable/nexus7/index.json",
+                "keyring": {
+                    "path": "/stable/nexus7/device-signing.tar.xz",
+                    "signature": "/stable/nexus7/device-signing.tar.xz.asc"
+                }
+            }
+        }
+    }
+}

=== renamed file 'systemimage/tests/data/channels_10.json' => 'systemimage/tests/data/main.channels_02.json'
=== added file 'systemimage/tests/data/main.channels_03.json'
--- systemimage/tests/data/main.channels_03.json	1970-01-01 00:00:00 +0000
+++ systemimage/tests/data/main.channels_03.json	2015-01-15 22:43:25 +0000
@@ -0,0 +1,13 @@
+{
+    "stable": {
+        "devices": {
+            "nexus7": {
+                "index": "/stable/nexus7/index.json",
+                "keyring": {
+                    "path": "/stable/nexus7/device-signing.tar.xz",
+                    "signature": "/stable/nexus7/device-signing.tar.xz.asc"
+                }
+            }
+        }
+    }
+}

=== renamed file 'systemimage/tests/data/config_01.ini' => 'systemimage/tests/data/main.config_01.ini'
--- systemimage/tests/data/config_01.ini	2013-11-12 19:57:39 +0000
+++ systemimage/tests/data/main.config_01.ini	2015-01-15 22:43:25 +0000
@@ -5,12 +5,11 @@
 base: phablet.example.com
 http_port: 80
 https_port: 443
-channel: stable
+channel: special
 build_number: 0
 
 [system]
 timeout: 10s
-build_file: /etc/ubuntu-build
 tempdir: /tmp
 logfile: /var/log/system-image/client.log
 loglevel: error
@@ -23,8 +22,8 @@
 device_signing: /var/lib/phablet/device-signing.tar.xz
 
 [updater]
-cache_partition: /android/cache
-data_partition: /var/lib/phablet/updater
+cache_partition: {tmpdir}/android/cache
+data_partition: {vardir}/lib/phablet/updater
 
 [hooks]
 device: systemimage.device.SystemProperty

=== renamed file 'systemimage/tests/data/channel_01.ini' => 'systemimage/tests/data/main.config_02.ini'
=== renamed file 'systemimage/tests/data/channel_05.ini' => 'systemimage/tests/data/main.config_03.ini'
=== renamed file 'systemimage/tests/data/channel_03.ini' => 'systemimage/tests/data/main.config_04.ini'
=== added file 'systemimage/tests/data/main.config_05.ini'
--- systemimage/tests/data/main.config_05.ini	1970-01-01 00:00:00 +0000
+++ systemimage/tests/data/main.config_05.ini	2015-01-15 22:43:25 +0000
@@ -0,0 +1,7 @@
+[service]
+base: localhost
+http_port: 8980
+https_port: 8943
+channel: daily
+build_number: 300
+channel_target: saucy

=== renamed file 'systemimage/tests/data/channel_04.ini' => 'systemimage/tests/data/main.config_07.ini'
--- systemimage/tests/data/channel_04.ini	2013-09-06 22:09:02 +0000
+++ systemimage/tests/data/main.config_07.ini	2015-01-15 22:43:25 +0000
@@ -3,4 +3,4 @@
 http_port: 8980
 https_port: 8943
 channel: saucy
-build_number: 1
+build_number: 33

=== renamed file 'systemimage/tests/data/index_14.json' => 'systemimage/tests/data/main.index_01.json'
=== renamed file 'systemimage/tests/data/index_20.json' => 'systemimage/tests/data/main.index_02.json'
=== renamed file 'systemimage/tests/data/index_15.json' => 'systemimage/tests/data/main.index_03.json'
=== added file 'systemimage/tests/data/main.index_04.json'
--- systemimage/tests/data/main.index_04.json	1970-01-01 00:00:00 +0000
+++ systemimage/tests/data/main.index_04.json	2015-01-15 22:43:25 +0000
@@ -0,0 +1,36 @@
+{
+    "global": {
+        "generated_at": "Thu Aug 01 08:01:00 UTC 2013"
+    },
+    "images": [
+        {
+            "description": "Full",
+            "files": [
+                {
+                    "checksum": "da70dfa4d9f95ac979f921e8e623358236313f334afcd06cddf8a5621cf6a1e9",
+                    "order": 3,
+                    "path": "/3/4/5.txt",
+                    "signature": "/3/4/5.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "b3a8e0e1f9ab1bfe3a36f231f676f78bb30a519d2b21e6c530c0eee8ebb4a5d0",
+                    "order": 1,
+                    "path": "/4/5/6.txt",
+                    "signature": "/4/5/6.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "97a6d21df7c51e8289ac1a8c026aaac143e15aa1957f54f42e30d8f8a85c3a55",
+                    "order": 2,
+                    "path": "/5/6/5.txt",
+                    "signature": "/5/6/5.txt.asc",
+                    "size": 104857600
+                }
+            ],
+            "type": "full",
+            "version": 1600,
+            "bootme": true
+        }
+    ]
+}

=== added file 'systemimage/tests/data/main.index_05.json'
--- systemimage/tests/data/main.index_05.json	1970-01-01 00:00:00 +0000
+++ systemimage/tests/data/main.index_05.json	2015-01-15 22:43:25 +0000
@@ -0,0 +1,36 @@
+{
+    "global": {
+        "generated_at": "Thu Aug 01 08:01:00 UTC 2013"
+    },
+    "images": [
+        {
+            "description": "Full",
+            "files": [
+                {
+                    "checksum": "da70dfa4d9f95ac979f921e8e623358236313f334afcd06cddf8a5621cf6a1e9",
+                    "order": 3,
+                    "path": "/3/4/5.txt",
+                    "signature": "/3/4/5.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "b3a8e0e1f9ab1bfe3a36f231f676f78bb30a519d2b21e6c530c0eee8ebb4a5d0",
+                    "order": 1,
+                    "path": "/4/5/6.txt",
+                    "signature": "/4/5/6.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "97a6d21df7c51e8289ac1a8c026aaac143e15aa1957f54f42e30d8f8a85c3a55",
+                    "order": 2,
+                    "path": "/5/6/7.txt",
+                    "signature": "/5/6/7.txt.asc",
+                    "size": 104857600
+                }
+            ],
+            "type": "full",
+            "version": 1600,
+            "bootme": true
+        }
+    ]
+}

=== added file 'systemimage/tests/data/scores.index_01.json'
--- systemimage/tests/data/scores.index_01.json	1970-01-01 00:00:00 +0000
+++ systemimage/tests/data/scores.index_01.json	2015-01-15 22:43:25 +0000
@@ -0,0 +1,245 @@
+{
+    "global": {
+        "generated_at": "Mon Apr 29 18:45:27 UTC 2013"
+    },
+    "images": [
+        {
+            "bootme": true,
+            "description": "Full A",
+            "files": [
+                {
+                    "checksum": "abc",
+                    "order": 1,
+                    "path": "/a/b/c.txt",
+                    "signature": "/a/b/c.txt.asc",
+                    "size": 104857600
+
+                },
+                {
+                    "checksum": "bcd",
+                    "order": 1,
+                    "path": "/b/c/d.txt",
+                    "signature": "/b/c/d.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "cde",
+                    "order": 1,
+                    "path": "/c/d/e.txt",
+                    "signature": "/c/d/e.txt.asc",
+                    "size": 104857600
+                }
+            ],
+            "type": "full",
+            "version": 300
+        },
+        {
+            "base": 300,
+            "bootme": true,
+            "description": "Delta A.1",
+            "files": [
+                {
+                    "checksum": "def",
+                    "order": 1,
+                    "path": "/d/e/f.txt",
+                    "signature": "/d/e/f.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "ef0",
+                    "order": 1,
+                    "path": "/e/f/0.txt",
+                    "signature": "/e/f/0.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "f01",
+                    "order": 1,
+                    "path": "/f/e/1.txt",
+                    "signature": "/f/e/1.txt.asc",
+                    "size": 104857600
+                }
+            ],
+            "type": "delta",
+            "version": 301
+        },
+        {
+            "base": 301,
+            "bootme": true,
+            "description": "Delta A.2",
+            "files": [
+                {
+                    "checksum": "012",
+                    "order": 1,
+                    "path": "/0/1/2.txt",
+                    "signature": "/0/1/2.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "123",
+                    "order": 1,
+                    "path": "/1/2/3.txt",
+                    "signature": "/1/2/3.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "234",
+                    "order": 1,
+                    "path": "/2/3/4.txt",
+                    "signature": "/2/3/4.txt.asc",
+                    "size": 104857600
+                }
+            ],
+            "type": "delta",
+            "version": 304
+        },
+
+        {
+            "description": "Full B",
+            "files": [
+                {
+                    "checksum": "345",
+                    "order": 1,
+                    "path": "/3/4/5.txt",
+                    "signature": "/3/4/5.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "456",
+                    "order": 1,
+                    "path": "/4/5/6.txt",
+                    "signature": "/4/5/6.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "567",
+                    "order": 1,
+                    "path": "/5/6/7.txt",
+                    "signature": "/5/6/7.txt.asc",
+                    "size": 104857600
+                }
+            ],
+            "type": "full",
+            "version": 200
+        },
+        {
+            "base": 200,
+            "description": "Delta B.1",
+            "files": [
+                {
+                    "checksum": "678",
+                    "order": 1,
+                    "path": "/6/7/8.txt",
+                    "signature": "/6/7/8.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "789",
+                    "order": 1,
+                    "path": "/7/8/9.txt",
+                    "signature": "/7/8/9.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "89a",
+                    "order": 1,
+                    "path": "/8/9/a.txt",
+                    "signature": "/8/9/a.txt.asc",
+                    "size": 104857600
+                }
+            ],
+            "type": "delta",
+            "version": 201
+        },
+        {
+            "base": 201,
+            "description": "Delta B.2",
+            "files": [
+                {
+                    "checksum": "9ab",
+                    "order": 1,
+                    "path": "/9/a/b.txt",
+                    "signature": "/9/a/b.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "fed",
+                    "order": 1,
+                    "path": "/f/e/d.txt",
+                    "signature": "/f/e/d.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "edc",
+                    "order": 1,
+                    "path": "/e/d/c.txt",
+                    "signature": "/e/d/c.txt.asc",
+                    "size": 209715200
+
+                }
+            ],
+            "type": "delta",
+            "version": 304,
+            "phased-percentage": 0
+        },
+
+        {
+            "description": "Full C",
+            "files": [
+                {
+                    "checksum": "dcb",
+                    "order": 1,
+                    "path": "/d/c/b.txt",
+                    "signature": "/d/c/b.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "cba",
+                    "order": 1,
+                    "path": "/c/b/a.txt",
+                    "signature": "/c/b/a.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "ba9",
+                    "order": 1,
+                    "path": "/b/a/9.txt",
+                    "signature": "/b/a/9.txt.asc",
+                    "size": 104857600
+                }
+            ],
+            "type": "full",
+            "version": 100
+        },
+        {
+            "base": 100,
+            "description": "Delta C.1",
+            "files": [
+                {
+                    "checksum": "a98",
+                    "order": 1,
+                    "path": "/a/9/8.txt",
+                    "signature": "/a/9/8.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "987",
+                    "order": 1,
+                    "path": "/9/8/7.txt",
+                    "signature": "/9/8/7.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "876",
+                    "order": 1,
+                    "path": "/8/7/6.txt",
+                    "signature": "/8/7/6.txt.asc",
+                    "size": 838860800
+
+                }
+            ],
+            "type": "delta",
+            "version": 303
+        }
+    ]
+}

=== renamed file 'systemimage/tests/data/index_08.json' => 'systemimage/tests/data/scores.index_02.json'
=== renamed file 'systemimage/tests/data/index_09.json' => 'systemimage/tests/data/scores.index_03.json'
=== renamed file 'systemimage/tests/data/index_17.json' => 'systemimage/tests/data/scores.index_04.json'
=== added file 'systemimage/tests/data/scores.index_05.json'
--- systemimage/tests/data/scores.index_05.json	1970-01-01 00:00:00 +0000
+++ systemimage/tests/data/scores.index_05.json	2015-01-15 22:43:25 +0000
@@ -0,0 +1,245 @@
+{
+    "global": {
+        "generated_at": "Mon Apr 29 18:45:27 UTC 2013"
+    },
+    "images": [
+        {
+            "bootme": true,
+            "description": "Full A",
+            "files": [
+                {
+                    "checksum": "abc",
+                    "order": 1,
+                    "path": "/a/b/c.txt",
+                    "signature": "/a/b/c.txt.asc",
+                    "size": 104857600
+
+                },
+                {
+                    "checksum": "bcd",
+                    "order": 1,
+                    "path": "/b/c/d.txt",
+                    "signature": "/b/c/d.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "cde",
+                    "order": 1,
+                    "path": "/c/d/e.txt",
+                    "signature": "/c/d/e.txt.asc",
+                    "size": 104857600
+                }
+            ],
+            "type": "full",
+            "version": 300
+        },
+        {
+            "base": 300,
+            "bootme": true,
+            "description": "Delta A.1",
+            "files": [
+                {
+                    "checksum": "def",
+                    "order": 1,
+                    "path": "/d/e/f.txt",
+                    "signature": "/d/e/f.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "ef0",
+                    "order": 1,
+                    "path": "/e/f/0.txt",
+                    "signature": "/e/f/0.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "f01",
+                    "order": 1,
+                    "path": "/f/e/1.txt",
+                    "signature": "/f/e/1.txt.asc",
+                    "size": 104857600
+                }
+            ],
+            "type": "delta",
+            "version": 301
+        },
+        {
+            "base": 301,
+            "bootme": true,
+            "description": "Delta A.2",
+            "files": [
+                {
+                    "checksum": "012",
+                    "order": 1,
+                    "path": "/0/1/2.txt",
+                    "signature": "/0/1/2.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "123",
+                    "order": 1,
+                    "path": "/1/2/3.txt",
+                    "signature": "/1/2/3.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "234",
+                    "order": 1,
+                    "path": "/2/3/4.txt",
+                    "signature": "/2/3/4.txt.asc",
+                    "size": 104857600
+                }
+            ],
+            "type": "delta",
+            "version": 304
+        },
+
+        {
+            "description": "Full B",
+            "files": [
+                {
+                    "checksum": "345",
+                    "order": 1,
+                    "path": "/3/4/5.txt",
+                    "signature": "/3/4/5.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "456",
+                    "order": 1,
+                    "path": "/4/5/6.txt",
+                    "signature": "/4/5/6.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "567",
+                    "order": 1,
+                    "path": "/5/6/7.txt",
+                    "signature": "/5/6/7.txt.asc",
+                    "size": 104857600
+                }
+            ],
+            "type": "full",
+            "version": 200
+        },
+        {
+            "base": 200,
+            "description": "Delta B.1",
+            "files": [
+                {
+                    "checksum": "678",
+                    "order": 1,
+                    "path": "/6/7/8.txt",
+                    "signature": "/6/7/8.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "789",
+                    "order": 1,
+                    "path": "/7/8/9.txt",
+                    "signature": "/7/8/9.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "89a",
+                    "order": 1,
+                    "path": "/8/9/a.txt",
+                    "signature": "/8/9/a.txt.asc",
+                    "size": 104857600
+                }
+            ],
+            "type": "delta",
+            "version": 201
+        },
+        {
+            "base": 201,
+            "description": "Delta B.2",
+            "files": [
+                {
+                    "checksum": "9ab",
+                    "order": 1,
+                    "path": "/9/a/b.txt",
+                    "signature": "/9/a/b.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "fed",
+                    "order": 1,
+                    "path": "/f/e/d.txt",
+                    "signature": "/f/e/d.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "edc",
+                    "order": 1,
+                    "path": "/e/d/c.txt",
+                    "signature": "/e/d/c.txt.asc",
+                    "size": 209715200
+
+                }
+            ],
+            "type": "delta",
+            "version": 304,
+            "phased-percentage": 50
+        },
+
+        {
+            "description": "Full C",
+            "files": [
+                {
+                    "checksum": "dcb",
+                    "order": 1,
+                    "path": "/d/c/b.txt",
+                    "signature": "/d/c/b.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "cba",
+                    "order": 1,
+                    "path": "/c/b/a.txt",
+                    "signature": "/c/b/a.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "ba9",
+                    "order": 1,
+                    "path": "/b/a/9.txt",
+                    "signature": "/b/a/9.txt.asc",
+                    "size": 104857600
+                }
+            ],
+            "type": "full",
+            "version": 100
+        },
+        {
+            "base": 100,
+            "description": "Delta C.1",
+            "files": [
+                {
+                    "checksum": "a98",
+                    "order": 1,
+                    "path": "/a/9/8.txt",
+                    "signature": "/a/9/8.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "987",
+                    "order": 1,
+                    "path": "/9/8/7.txt",
+                    "signature": "/9/8/7.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "876",
+                    "order": 1,
+                    "path": "/8/7/6.txt",
+                    "signature": "/8/7/6.txt.asc",
+                    "size": 838860800
+
+                }
+            ],
+            "type": "delta",
+            "version": 303
+        }
+    ]
+}

=== added file 'systemimage/tests/data/state.channel_01.ini'
--- systemimage/tests/data/state.channel_01.ini	1970-01-01 00:00:00 +0000
+++ systemimage/tests/data/state.channel_01.ini	2015-01-15 22:43:25 +0000
@@ -0,0 +1,6 @@
+[service]
+base: localhost
+http_port: 8980
+https_port: 8943
+channel: saucy
+build_number: 1

=== added file 'systemimage/tests/data/state.channels_01.json'
--- systemimage/tests/data/state.channels_01.json	1970-01-01 00:00:00 +0000
+++ systemimage/tests/data/state.channels_01.json	2015-01-15 22:43:25 +0000
@@ -0,0 +1,64 @@
+{
+    "daily": {
+        "alias": "tubular",
+        "devices": {
+            "grouper": {
+                "index": "/daily/grouper/index.json"
+            },
+            "maguro": {
+                "index": "/daily/maguro/index.json"
+            },
+            "mako": {
+                "index": "/daily/mako/index.json"
+            },
+            "manta": {
+                "index": "/daily/manta/index.json",
+                "keyring": {
+                    "path": "/daily/manta/device-signing.tar.xz",
+                    "signature": "/daily/manta/device-signing.tar.xz.asc"
+                }
+            }
+        }
+    },
+    "saucy": {
+        "devices": {
+            "grouper": {
+                "index": "/saucy/grouper/index.json"
+            },
+            "maguro": {
+                "index": "/saucy/maguro/index.json"
+            },
+            "mako": {
+                "index": "/saucy/mako/index.json"
+            },
+            "manta": {
+                "index": "/saucy/manta/index.json",
+                "keyring": {
+                    "path": "/saucy/manta/device-signing.tar.xz",
+                    "signature": "/saucy/manta/device-signing.tar.xz.asc"
+                }
+            }
+        }
+    },
+    "tubular": {
+        "hidden": true,
+        "devices": {
+            "grouper": {
+                "index": "/tubular/grouper/index.json"
+            },
+            "maguro": {
+                "index": "/tubular/maguro/index.json"
+            },
+            "mako": {
+                "index": "/tubular/mako/index.json"
+            },
+            "manta": {
+                "index": "/tubular/manta/index.json",
+                "keyring": {
+                    "path": "/tubular/manta/device-signing.tar.xz",
+                    "signature": "/tubular/manta/device-signing.tar.xz.asc"
+                }
+            }
+        }
+    }
+}

=== added file 'systemimage/tests/data/state.channels_02.json'
--- systemimage/tests/data/state.channels_02.json	1970-01-01 00:00:00 +0000
+++ systemimage/tests/data/state.channels_02.json	2015-01-15 22:43:25 +0000
@@ -0,0 +1,13 @@
+{
+    "stable": {
+        "devices": {
+            "nexus7": {
+                "index": "/stable/nexus7/index.json",
+                "keyring": {
+                    "path": "/stable/nexus7/device-signing.tar.xz",
+                    "signature": "/stable/nexus7/device-signing.tar.xz.asc"
+                }
+            }
+        }
+    }
+}

=== renamed file 'systemimage/tests/data/channels_11.json' => 'systemimage/tests/data/state.channels_03.json'
=== renamed file 'systemimage/tests/data/channels_07.json' => 'systemimage/tests/data/state.channels_04.json'
=== renamed file 'systemimage/tests/data/channels_08.json' => 'systemimage/tests/data/state.channels_05.json'
=== renamed file 'systemimage/tests/data/channels_09.json' => 'systemimage/tests/data/state.channels_06.json'
=== renamed file 'systemimage/tests/data/channels_01.json' => 'systemimage/tests/data/state.channels_07.json'
=== added file 'systemimage/tests/data/state.index_01.json'
--- systemimage/tests/data/state.index_01.json	1970-01-01 00:00:00 +0000
+++ systemimage/tests/data/state.index_01.json	2015-01-15 22:43:25 +0000
@@ -0,0 +1,244 @@
+{
+    "global": {
+        "generated_at": "Mon Apr 29 18:45:27 UTC 2013"
+    },
+    "images": [
+        {
+            "bootme": true,
+            "description": "Full A",
+            "files": [
+                {
+                    "checksum": "abc",
+                    "order": 1,
+                    "path": "/a/b/c.txt",
+                    "signature": "/a/b/c.txt.asc",
+                    "size": 104857600
+
+                },
+                {
+                    "checksum": "bcd",
+                    "order": 1,
+                    "path": "/b/c/d.txt",
+                    "signature": "/b/c/d.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "cde",
+                    "order": 1,
+                    "path": "/c/d/e.txt",
+                    "signature": "/c/d/e.txt.asc",
+                    "size": 104857600
+                }
+            ],
+            "type": "full",
+            "version": 300
+        },
+        {
+            "base": 300,
+            "bootme": true,
+            "description": "Delta A.1",
+            "files": [
+                {
+                    "checksum": "def",
+                    "order": 1,
+                    "path": "/d/e/f.txt",
+                    "signature": "/d/e/f.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "ef0",
+                    "order": 1,
+                    "path": "/e/f/0.txt",
+                    "signature": "/e/f/0.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "f01",
+                    "order": 1,
+                    "path": "/f/e/1.txt",
+                    "signature": "/f/e/1.txt.asc",
+                    "size": 104857600
+                }
+            ],
+            "type": "delta",
+            "version": 301
+        },
+        {
+            "base": 301,
+            "bootme": true,
+            "description": "Delta A.2",
+            "files": [
+                {
+                    "checksum": "012",
+                    "order": 1,
+                    "path": "/0/1/2.txt",
+                    "signature": "/0/1/2.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "123",
+                    "order": 1,
+                    "path": "/1/2/3.txt",
+                    "signature": "/1/2/3.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "234",
+                    "order": 1,
+                    "path": "/2/3/4.txt",
+                    "signature": "/2/3/4.txt.asc",
+                    "size": 104857600
+                }
+            ],
+            "type": "delta",
+            "version": 304
+        },
+
+        {
+            "description": "Full B",
+            "files": [
+                {
+                    "checksum": "345",
+                    "order": 1,
+                    "path": "/3/4/5.txt",
+                    "signature": "/3/4/5.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "456",
+                    "order": 1,
+                    "path": "/4/5/6.txt",
+                    "signature": "/4/5/6.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "567",
+                    "order": 1,
+                    "path": "/5/6/7.txt",
+                    "signature": "/5/6/7.txt.asc",
+                    "size": 104857600
+                }
+            ],
+            "type": "full",
+            "version": 200
+        },
+        {
+            "base": 200,
+            "description": "Delta B.1",
+            "files": [
+                {
+                    "checksum": "678",
+                    "order": 1,
+                    "path": "/6/7/8.txt",
+                    "signature": "/6/7/8.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "789",
+                    "order": 1,
+                    "path": "/7/8/9.txt",
+                    "signature": "/7/8/9.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "89a",
+                    "order": 1,
+                    "path": "/8/9/a.txt",
+                    "signature": "/8/9/a.txt.asc",
+                    "size": 104857600
+                }
+            ],
+            "type": "delta",
+            "version": 201
+        },
+        {
+            "base": 201,
+            "description": "Delta B.2",
+            "files": [
+                {
+                    "checksum": "9ab",
+                    "order": 1,
+                    "path": "/9/a/b.txt",
+                    "signature": "/9/a/b.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "fed",
+                    "order": 1,
+                    "path": "/f/e/d.txt",
+                    "signature": "/f/e/d.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "edc",
+                    "order": 1,
+                    "path": "/e/d/c.txt",
+                    "signature": "/e/d/c.txt.asc",
+                    "size": 209715200
+
+                }
+            ],
+            "type": "delta",
+            "version": 304
+        },
+
+        {
+            "description": "Full C",
+            "files": [
+                {
+                    "checksum": "dcb",
+                    "order": 1,
+                    "path": "/d/c/b.txt",
+                    "signature": "/d/c/b.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "cba",
+                    "order": 1,
+                    "path": "/c/b/a.txt",
+                    "signature": "/c/b/a.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "ba9",
+                    "order": 1,
+                    "path": "/b/a/9.txt",
+                    "signature": "/b/a/9.txt.asc",
+                    "size": 104857600
+                }
+            ],
+            "type": "full",
+            "version": 100
+        },
+        {
+            "base": 100,
+            "description": "Delta C.1",
+            "files": [
+                {
+                    "checksum": "a98",
+                    "order": 1,
+                    "path": "/a/9/8.txt",
+                    "signature": "/a/9/8.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "987",
+                    "order": 1,
+                    "path": "/9/8/7.txt",
+                    "signature": "/9/8/7.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "876",
+                    "order": 1,
+                    "path": "/8/7/6.txt",
+                    "signature": "/8/7/6.txt.asc",
+                    "size": 838860800
+
+                }
+            ],
+            "type": "delta",
+            "version": 303
+        }
+    ]
+}

=== added file 'systemimage/tests/data/state.index_02.json'
--- systemimage/tests/data/state.index_02.json	1970-01-01 00:00:00 +0000
+++ systemimage/tests/data/state.index_02.json	2015-01-15 22:43:25 +0000
@@ -0,0 +1,245 @@
+{
+    "global": {
+        "generated_at": "Mon Apr 29 18:45:27 UTC 2013"
+    },
+    "images": [
+        {
+            "bootme": true,
+            "description": "Full A",
+            "files": [
+                {
+                    "checksum": "abc",
+                    "order": 1,
+                    "path": "/a/b/c.txt",
+                    "signature": "/a/b/c.txt.asc",
+                    "size": 104857600
+
+                },
+                {
+                    "checksum": "bcd",
+                    "order": 1,
+                    "path": "/b/c/d.txt",
+                    "signature": "/b/c/d.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "cde",
+                    "order": 1,
+                    "path": "/c/d/e.txt",
+                    "signature": "/c/d/e.txt.asc",
+                    "size": 104857600
+                }
+            ],
+            "type": "full",
+            "version": 300
+        },
+        {
+            "base": 300,
+            "bootme": true,
+            "description": "Delta A.1",
+            "files": [
+                {
+                    "checksum": "def",
+                    "order": 1,
+                    "path": "/d/e/f.txt",
+                    "signature": "/d/e/f.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "ef0",
+                    "order": 1,
+                    "path": "/e/f/0.txt",
+                    "signature": "/e/f/0.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "f01",
+                    "order": 1,
+                    "path": "/f/e/1.txt",
+                    "signature": "/f/e/1.txt.asc",
+                    "size": 104857600
+                }
+            ],
+            "type": "delta",
+            "version": 301
+        },
+        {
+            "base": 301,
+            "bootme": true,
+            "description": "Delta A.2",
+            "files": [
+                {
+                    "checksum": "012",
+                    "order": 1,
+                    "path": "/0/1/2.txt",
+                    "signature": "/0/1/2.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "123",
+                    "order": 1,
+                    "path": "/1/2/3.txt",
+                    "signature": "/1/2/3.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "234",
+                    "order": 1,
+                    "path": "/2/3/4.txt",
+                    "signature": "/2/3/4.txt.asc",
+                    "size": 104857600
+                }
+            ],
+            "type": "delta",
+            "version": 304
+        },
+
+        {
+            "description": "Full B",
+            "files": [
+                {
+                    "checksum": "345",
+                    "order": 1,
+                    "path": "/3/4/5.txt",
+                    "signature": "/3/4/5.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "456",
+                    "order": 1,
+                    "path": "/4/5/6.txt",
+                    "signature": "/4/5/6.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "567",
+                    "order": 1,
+                    "path": "/5/6/7.txt",
+                    "signature": "/5/6/7.txt.asc",
+                    "size": 104857600
+                }
+            ],
+            "type": "full",
+            "version": 200
+        },
+        {
+            "base": 200,
+            "description": "Delta B.1",
+            "files": [
+                {
+                    "checksum": "678",
+                    "order": 1,
+                    "path": "/6/7/8.txt",
+                    "signature": "/6/7/8.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "789",
+                    "order": 1,
+                    "path": "/7/8/9.txt",
+                    "signature": "/7/8/9.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "89a",
+                    "order": 1,
+                    "path": "/8/9/a.txt",
+                    "signature": "/8/9/a.txt.asc",
+                    "size": 104857600
+                }
+            ],
+            "type": "delta",
+            "version": 201
+        },
+        {
+            "base": 201,
+            "description": "Delta B.2",
+            "files": [
+                {
+                    "checksum": "9ab",
+                    "order": 1,
+                    "path": "/9/a/b.txt",
+                    "signature": "/9/a/b.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "fed",
+                    "order": 1,
+                    "path": "/f/e/d.txt",
+                    "signature": "/f/e/d.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "edc",
+                    "order": 1,
+                    "path": "/e/d/c.txt",
+                    "signature": "/e/d/c.txt.asc",
+                    "size": 209715200
+
+                }
+            ],
+            "type": "delta",
+            "version": 304,
+            "phased-percentage": 0
+        },
+
+        {
+            "description": "Full C",
+            "files": [
+                {
+                    "checksum": "dcb",
+                    "order": 1,
+                    "path": "/d/c/b.txt",
+                    "signature": "/d/c/b.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "cba",
+                    "order": 1,
+                    "path": "/c/b/a.txt",
+                    "signature": "/c/b/a.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "ba9",
+                    "order": 1,
+                    "path": "/b/a/9.txt",
+                    "signature": "/b/a/9.txt.asc",
+                    "size": 104857600
+                }
+            ],
+            "type": "full",
+            "version": 100
+        },
+        {
+            "base": 100,
+            "description": "Delta C.1",
+            "files": [
+                {
+                    "checksum": "a98",
+                    "order": 1,
+                    "path": "/a/9/8.txt",
+                    "signature": "/a/9/8.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "987",
+                    "order": 1,
+                    "path": "/9/8/7.txt",
+                    "signature": "/9/8/7.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "876",
+                    "order": 1,
+                    "path": "/8/7/6.txt",
+                    "signature": "/8/7/6.txt.asc",
+                    "size": 838860800
+
+                }
+            ],
+            "type": "delta",
+            "version": 303
+        }
+    ]
+}

=== added file 'systemimage/tests/data/state.index_03.json'
--- systemimage/tests/data/state.index_03.json	1970-01-01 00:00:00 +0000
+++ systemimage/tests/data/state.index_03.json	2015-01-15 22:43:25 +0000
@@ -0,0 +1,36 @@
+{
+    "global": {
+        "generated_at": "Thu Aug 01 08:01:00 UTC 2013"
+    },
+    "images": [
+        {
+            "description": "Full",
+            "files": [
+                {
+                    "checksum": "da70dfa4d9f95ac979f921e8e623358236313f334afcd06cddf8a5621cf6a1e9",
+                    "order": 3,
+                    "path": "/3/4/5.txt",
+                    "signature": "/3/4/5.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "b3a8e0e1f9ab1bfe3a36f231f676f78bb30a519d2b21e6c530c0eee8ebb4a5d0",
+                    "order": 1,
+                    "path": "/4/5/6.txt",
+                    "signature": "/4/5/6.txt.asc",
+                    "size": 104857600
+                },
+                {
+                    "checksum": "97a6d21df7c51e8289ac1a8c026aaac143e15aa1957f54f42e30d8f8a85c3a55",
+                    "order": 2,
+                    "path": "/5/6/7.txt",
+                    "signature": "/5/6/7.txt.asc",
+                    "size": 104857600
+                }
+            ],
+            "type": "full",
+            "version": 1600,
+            "bootme": true
+        }