~barry/ubuntu-system-image/lp1373467

More clean up and renames.

files renamed:
systemimage/tests/data/channels_06.json => systemimage/tests/data/dbus.channels_01.json

systemimage/tests/data/helpers_01.ini => systemimage/tests/data/helpers.config_01.ini

systemimage/tests/data/helpers_02.ini => systemimage/tests/data/helpers.config_02.ini

systemimage/tests/data/index_01.json => systemimage/tests/data/index.index_02.json

systemimage/tests/data/channels_02.json => systemimage/tests/data/winner.channels_01.json

systemimage/tests/data/channels_03.json => systemimage/tests/data/winner.channels_02.json

added added

removed removed

300

make_http_server(serverdir, 8943, 'cert.pem', 'key.pem'))

301

cls._resources.push(make_http_server(serverdir, 8980))

302

# Set up the server files.

303

copy('channels_06.json', serverdir, 'channels.json')

303

copy('dbus.channels_01.json', serverdir, 'channels.json')

304

sign(os.path.join(serverdir, 'channels.json'), 'image-signing.gpg')

305

# Only the archive-master key is pre-loaded. All the other keys

306

# are downloaded and there will be both a blacklist and device