Merge lp:~robru/cupstream2distro/moar-bileto into lp:cupstream2distro

[Robert Bruce Park]

Convert dual property to Bileto.

[lp:~robru/cupstream2distro/moar-bileto]

1092. By Robert Bruce Park on 2015-09-04

Drop unused additional_targets.

1093. By Robert Bruce Park on 2015-09-04

Add TODO comment.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1093
http://jenkins.qa.ubuntu.com/job/cu2d-choo-choo-ci/752/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/cu2d-choo-choo-ci/752/rebuild

review: Approve (continuous-integration)

[lp:~robru/cupstream2distro/moar-bileto]

1094. By Robert Bruce Park on 2015-09-05

Convert status to Bileto.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1094
http://jenkins.qa.ubuntu.com/job/cu2d-choo-choo-ci/753/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/cu2d-choo-choo-ci/753/rebuild

review: Approve (continuous-integration)

[lp:~robru/cupstream2distro/moar-bileto]

1095. By Robert Bruce Park on 2015-09-05

Convert ppa property to bileto.

1096. By Robert Bruce Park on 2015-09-05

Make assertEqual stop sucking out loud.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1096
http://jenkins.qa.ubuntu.com/job/cu2d-choo-choo-ci/754/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/cu2d-choo-choo-ci/754/rebuild

review: Approve (continuous-integration)

[Robert Bruce Park (robru)]

Looking good in staging:

https://ci-train.staging.ubuntu.com/job/ubuntu-landing-003-1-build/3/console

review: Approve

=== modified file 'citrain/prepare_silo.py'
--- citrain/prepare_silo.py	2015-09-04 00:38:51 +0000
+++ citrain/prepare_silo.py	2015-09-05 01:43:08 +0000
@@ -109,8 +109,6 @@
             raise PrepError(
                 'SOURCES and SYNC_REQUEST not supported by dual landings.')
         env.SERIES = 'wily'
-        env.DUAL = 'vivid'
-        logging.info('Dual silo: {} and {}.'.format(env.SERIES, env.DUAL))
 
 
 def create_directories():
@@ -158,8 +156,6 @@
     silo_state = SiloState.new_blank(
         siloname=env.SILONAME,
         requestid=env.REQUEST_ID)
-    silo_state.dual = env.DUAL
-    silo_state.ppa = lp.get_ppa(LANDING_SCHEME.format(env.SILONAME))
     if env.SYNC_REQUEST:
         prepare_sync(silo_state)
     return silo_state

=== modified file 'cupstream2distro/launchpadmanager.py'
--- cupstream2distro/launchpadmanager.py	2015-09-04 00:38:51 +0000
+++ cupstream2distro/launchpadmanager.py	2015-09-05 01:43:08 +0000
@@ -21,9 +21,7 @@
 from launchpadlib.launchpad import Launchpad
 
 from cupstream2distro.utils import env, memoize, os_path_join_safe, singleton
-from cupstream2distro.settings import (
-    COMMON_LAUNCHPAD_CACHE_DIR
-)
+from cupstream2distro.settings import COMMON_LAUNCHPAD_CACHE_DIR
 
 
 CREDS_PATH = os.path.expanduser(
@@ -68,6 +66,7 @@
         """Return a lp resource from a launchpad url."""
         return self._launchpad.load(url.replace(MP_ROOT, self._api_root))
 
+    @memoize
     def get_series(self, series_name, dest=None, distro_name='ubuntu'):
         """Return the launchpad object for the requested series name."""
         distro_name = dest.distribution.name if dest else distro_name

=== modified file 'cupstream2distro/silomanager.py'
--- cupstream2distro/silomanager.py	2015-09-04 00:38:51 +0000
+++ cupstream2distro/silomanager.py	2015-09-05 01:43:08 +0000
@@ -37,6 +37,7 @@
     BILETO_API,
     BILETO_GET,
     BILETO_IP,
+    LANDING_SCHEME,
     SILO_NAME_LIST,
     SILOS_DIR,
 )
@@ -125,13 +126,14 @@
     return TOKEN_SCRUB.sub('token=XXX', message)
 
 
+# TODO: everything that references SiloState._config needs to be converted
+# to use Bileto instead, also all ".setter" properties should go.
 class SiloState(object):
     """This class stores and manipulates the silo config json blob."""
     CONFIG_FILENAME = 'config'
     _bileto = None
     _config = None
     _configfile = None
-    _ppa = None
 
     @classmethod
     def iterate(cls, ignore=None):
@@ -174,7 +176,6 @@
             'siloname': siloname,
             'mps': {},
         }
-        silo_state._mtime = silo_state.get_mtime()
         return silo_state
 
     @staticmethod
@@ -207,7 +208,6 @@
     def __init__(self, siloname, do_load=True, log=True):
         """Create a new SiloState object for an already-assigned silo."""
         self.siloname = siloname
-        self._mtime = None
         if do_load:
             self.load_config()
         self.info = logging.info if log else lambda *ignore: None
@@ -222,6 +222,13 @@
             self.load_bileto()
         return self._bileto[key.strip('_')]
 
+    def __setattr__(self, key, value):
+        """Set Bileto attributes in Bileto."""
+        if key in ('status', 'job_log'):
+            self._bileto[key] = value
+        else:
+            super().__setattr__(key, value)
+
     def mark_others_dirty(self):
         """Indicate that other silos need to be rebuilt."""
         projects = set(self.all_projects)
@@ -258,7 +265,6 @@
         """Read in the JSON blob."""
         with utf8_open(self.configfile) as data:
             self._config = json.load(data)
-        self._mtime = self.get_mtime()
 
     def push_to_ppa_description(self):
         """Set the Silo PPA description to something meaningful."""
@@ -275,7 +281,7 @@
             packages=' '.join(self.all_projects),
             series=self.series.name,
             status_url=env.BUILD_URL + 'consoleFull',
-            status=self.message,
+            status=self.status,
             request_url=env.JENKINS_URL.replace('ci-', 'requests.ci-') +
             '#/ticket/{}'.format(self.requestid)).replace(
             'api.launchpad.net/devel', 'launchpad.net')
@@ -291,7 +297,7 @@
             job_log=env.BUILD_URL + 'consoleFull',
             published_versions=self.pkgversionlist,
             request_id=self.requestid,
-            status=self.message,
+            status=self.status,
             siloname=self.siloname,
         )
         try:
@@ -309,22 +315,15 @@
         """Write out the JSON blob."""
         self.push_to_bileto()
         self.push_to_ppa_description()
-        if self._mtime != self.get_mtime():
-            prev = SiloState(self.siloname, do_load=False)
-            prev._configfile = self.configfile
-            prev.load_config()
-            message = prev.message.strip('. ')
-            self.message = '{}. {}'.format(message, self.message)
         newfile = '{}.new'.format(self.configfile)
         with utf8_open(newfile, 'w') as config_file:
             json.dump(self._config, config_file)
         os.rename(newfile, self.configfile)
-        self._mtime = self.get_mtime()
 
     def set_config_status(self, state, message):
         """Update to reflect the latest status."""
         self.url = env.BUILD_URL + 'console'
-        self.message = scrub(message)
+        self.status = scrub(message)
         self.state = state
 
     def set_package_version_list(self, pkglist):
@@ -469,26 +468,6 @@
         self._config['global']['step'] = value
 
     @property
-    def dual(self):
-        """Report the secondary series name if this is a dual silo."""
-        return self._config.get('dual')
-
-    @dual.setter
-    def dual(self, value):
-        """Record the secondary series name, indicating this is a dual silo."""
-        self._config['dual'] = value
-
-    @property
-    def message(self):
-        """Fetch the silo status message."""
-        return self._config['global']['status']['message']
-
-    @message.setter
-    def message(self, value):
-        """Record the silo status message."""
-        self._config['global']['status']['message'] = value
-
-    @property
     def mps(self):
         """Identify the merge proposal URLs configured for this silo.
 
@@ -502,18 +481,6 @@
         self._config['mps'] = value
 
     @property
-    def ppa(self):
-        """Return launchpadlib object representing the silo ppa."""
-        if self._ppa is None:
-            self._ppa = lp.load(self._config['global']['ppa'])
-        return self._ppa
-
-    @ppa.setter
-    def ppa(self, value):
-        """Record the launchpadlib API URL representing the silo ppa."""
-        self._config['global']['ppa'] = value.self_link
-
-    @property
     def requestid(self):
         """Identify the requestid for this silo."""
         return self._config['requestid']
@@ -524,6 +491,19 @@
         self._config['requestid'] = value
 
     @property
+    def ppa(self):
+        """Return the lplib object representing the silo ppa."""
+        return lp.get_ppa(LANDING_SCHEME.format(env.SILONAME))
+
+    @property
+    def dual(self):
+        """Report the secondary series name if this is a dual silo."""
+        if self._series == 'dual':
+            return 'vivid'
+        if '+' in self._series:
+            return self._series.split('+')[-1]
+
+    @property
     def sources(self):
         """Identify the manual source packages configured for this silo."""
         archive = self.sync_request.split(',')[0]
@@ -556,7 +536,8 @@
     @property
     def series(self):
         """Return the launchpadlib object representing the distro series."""
-        series = 'wily' if self._series == 'dual' else self._series
+        series = self._series.split('+')[0]
+        series = dict(dual='wily').get(series, series)
         return lp.load('{}/{}'.format(self._distribution, series))
 
     @property
@@ -599,25 +580,10 @@
         """Record the jenkins job URL that is setting this status."""
         self._config['global']['status']['url'] = value
 
-    @property
-    def additional_targets(self):
-        """Identify the additional targets this silo is also built for."""
-        return self._config.get('additional_targets')
-
-    @additional_targets.setter
-    def additional_targets(self, value):
-        """Record additional targets for this silo to build for."""
-        self._config['additional_targets'] = value
-
     def append_mp(self, source_package, mp_link):
         """Record a new MP URL that this silo will build."""
         self._config['mps'].setdefault(source_package, []).append(mp_link)
 
-    def get_mtime(self):
-        """Return the mtime of our configfile."""
-        with suppress(OSError):
-            return os.path.getmtime(self.configfile)
-
 
 def save_error_message(message):
     """Load the silo state, set an error message, then save it back."""

=== modified file 'tests/unit/__init__.py'
--- tests/unit/__init__.py	2015-08-30 08:24:36 +0000
+++ tests/unit/__init__.py	2015-09-05 01:43:08 +0000
@@ -80,6 +80,15 @@
                     infix, name, 'Rename {}.{} to include "{}".'.format(
                         cls.__name__, name, infix))
 
+    def assertEqual(self, first, *args, **kwargs):
+        """Give me useful diffs, I mean, really!"""
+        if type(first) in (tuple, list):
+            self.assertSequenceEqual(first, *args, **kwargs)
+        elif type(first) is dict:
+            self.assertDictEqual(first, *args, **kwargs)
+        else:
+            super().assertEqual(first, *args, **kwargs)
+
 
 class BaseTestCase(DirectoryAwareTestCase):
     """Test module with helpers and keeping track of temp directories."""
@@ -95,7 +104,7 @@
 
     def assert_files_identical(self, filename1, filename2):
         """Assert if the files contents are identical."""
-        self.assertEquals(
+        self.assertEqual(
             utf8_open(filename1).read().strip(),
             utf8_open(filename2).read().strip())
 
@@ -103,7 +112,7 @@
         """Assert changelog files are identical, removing days/hours."""
         with utf8_open(alpha) as one:
             with utf8_open(beta) as two:
-                self.assertSequenceEqual(
+                self.assertEqual(
                     [clean(line) for line in one.readlines()],
                     [clean(line) for line in two.readlines()])
 

=== modified file 'tests/unit/test_recipe_base.py'
--- tests/unit/test_recipe_base.py	2015-09-03 18:50:16 +0000
+++ tests/unit/test_recipe_base.py	2015-09-05 01:43:08 +0000
@@ -193,7 +193,7 @@
             build.timed_out(started=90, timeout=110, message='passed'))
         self.assertIsNone(
             build.timed_out(started=0, timeout=9, message='', condition=False))
-        self.assertSequenceEqual(BuildBase.failures, set([
+        self.assertEqual(BuildBase.failures, set([
             'failed at 10',
             'failed at 99',
         ]))

=== modified file 'tests/unit/test_recipe_sourcesync.py'
--- tests/unit/test_recipe_sourcesync.py	2015-08-31 06:25:46 +0000
+++ tests/unit/test_recipe_sourcesync.py	2015-09-05 01:43:08 +0000
@@ -129,7 +129,7 @@
         self.assertEqual(os_mock.remove.mock_calls, [
             call(self.tempdir + '/sink_1.dsc'),
         ])
-        self.assertSequenceEqual(sh_mock.move.mock_calls, [
+        self.assertEqual(sh_mock.move.mock_calls, [
             call(self.tempdir + '/sink_1.orig.tar.gz',
                  self.tempdir + '/sink_1+15.04.20150210.orig.tar.gz'),
         ])

=== modified file 'tests/unit/test_script_prepare_silo.py'
--- tests/unit/test_script_prepare_silo.py	2015-09-04 00:38:51 +0000
+++ tests/unit/test_script_prepare_silo.py	2015-09-05 01:43:08 +0000
@@ -123,7 +123,6 @@
         env.SYNC_REQUEST = ''
         self.script.validate_variables()
         self.assertEqual(env.SERIES, 'wily')
-        self.assertEqual(env.DUAL, 'vivid')
 
     def test_validate_variables_fail(self):
         """Halt preparation if variables are missing."""
@@ -187,12 +186,12 @@
         env.DISTRIBUTION = 'ubuntu'
         self.script.join = Mock()
         self.script.create_directories()
-        self.assertSequenceEqual(
+        self.assertEqual(
             self.script.os.mkdir.mock_calls,
             [call(expanduser('~/silos'))])
-        self.assertSequenceEqual(self.script.os.makedirs.mock_calls, [
+        self.assertEqual(self.script.os.makedirs.mock_calls, [
             call(self.script.join.return_value, exist_ok=True)] * 10)
-        self.assertSequenceEqual(
+        self.assertEqual(
             self.script.join.mock_calls,
             [call(expanduser('~/silos'), siloname)
              for siloname in self.script.SILO_NAME_LIST[env.DISTRIBUTION]])
@@ -229,9 +228,6 @@
         self.script.lp.distributions = dict(ubuntu=Mock())
         self.script.prepare_sync = Mock()
         self.script.create_new_state()
-        self.assertEqual(self.script.lp.get_ppa.mock_calls, [
-            call('ci-train-staging-area/ubuntu/landing-123'),
-        ])
         self.script.SiloState.new_blank.assert_called_once_with(
             siloname='ubuntu/landing-123',
             requestid='42')
@@ -350,7 +346,7 @@
         self.assertEqual(self.script.lp.load.mock_calls, [
             call('http://example.com/a'), call('http://example.com/b'),
         ])
-        self.assertSequenceEqual(
+        self.assertEqual(
             self.script.Branch.get_package_name_from_branch.mock_calls, [call(
                 self.script.lp.load.return_value.target_branch.display_name
             )] * 2)

=== modified file 'tests/unit/test_script_publisher.py'
--- tests/unit/test_script_publisher.py	2015-09-02 03:32:52 +0000
+++ tests/unit/test_script_publisher.py	2015-09-05 01:43:08 +0000
@@ -221,8 +221,8 @@
         self.script.write_rsync_file(sources, dest)
         self.script.PackageList.assert_called_once_with()
         publish_source = self.script.PackageList().publish_source
-        self.assertSequenceEqual(publish_source.mock_calls, [call(sources[1])])
-        self.assertSequenceEqual(
+        self.assertEqual(publish_source.mock_calls, [call(sources[1])])
+        self.assertEqual(
             self.script.DotProject.mock_calls,
             [call('bar'), call().mark_as_published('2.0-0ubuntu1')])
         self.assertEqual(self.script.logging.error.call_count, 0)
@@ -256,7 +256,7 @@
             else:
                 self.assertNotIn(*args)
         get_ppa = self.script.lp.get_ppa.return_value
-        self.assertSequenceEqual(self.script.copy_to_dest.mock_calls, [
+        self.assertEqual(self.script.copy_to_dest.mock_calls, [
             call([sources[1]], dest=get_ppa, record=False),
             call([sources[3]], dest=get_ppa, record=False),
         ])

=== modified file 'tests/unit/test_script_setup_citrain.py'
--- tests/unit/test_script_setup_citrain.py	2015-08-22 03:29:10 +0000
+++ tests/unit/test_script_setup_citrain.py	2015-09-05 01:43:08 +0000
@@ -44,8 +44,8 @@
         with utf8_open(listfile, 'w') as data:
             data.write(json.dumps(expected))
         silos, distro = read_silo_names(listfile)
-        self.assertSequenceEqual(silos, expected)
-        self.assertDictEqual(distro, dict(ubuntu=silos))
+        self.assertEqual(silos, expected)
+        self.assertEqual(distro, dict(ubuntu=silos))
 
     def test_discover_silos(self):
         """Ensure that we can query launchpad for existing PPAs."""
@@ -57,11 +57,11 @@
         self.script.SILO_NAME_LIST = defaultdict(list)
         self.script.SILO_NAMES_FILE = '/tmp/ci-train-silo-names'
         self.script.discover_silos()
-        self.assertSequenceEqual(self.script.ALL_SILO_NAMES, [
+        self.assertEqual(self.script.ALL_SILO_NAMES, [
             'ubuntu/landing-000',
             'ubuntu/landing-999',
         ])
-        self.assertDictEqual(
+        self.assertEqual(
             self.script.SILO_NAME_LIST,
             dict(ubuntu=self.script.ALL_SILO_NAMES))
 
@@ -123,10 +123,10 @@
         self.script.setup_silo = Mock()
         self.script.setup_job = Mock()
         self.assertEqual(self.script.main(), 0)
-        self.assertSequenceEqual(self.script.setup_silo.mock_calls, [
+        self.assertEqual(self.script.setup_silo.mock_calls, [
             call('ubuntu/landing-{:03d}'.format(x)) for x in range(0, 10)
         ])
-        self.assertSequenceEqual(self.script.setup_job.mock_calls, [
+        self.assertEqual(self.script.setup_job.mock_calls, [
             call('cyphermox-test'),
             call('prepare-silo'),
             call('check-publication-migration'),

=== modified file 'tests/unit/test_silomanager.py'
--- tests/unit/test_silomanager.py	2015-09-04 00:38:51 +0000
+++ tests/unit/test_silomanager.py	2015-09-05 01:43:08 +0000
@@ -64,6 +64,7 @@
             landers='jim bob',
             series='wily',
             sources='',
+            status='Hello from SiloManagerTestCase.setUp()',
             sync_request='',
         )
         self.state._configfile = join(
@@ -109,7 +110,7 @@
         ]
         pre, expected = zip(*cases)
         result = [silomanager.scrub(case) for case in pre]
-        self.assertSequenceEqual(result, expected)
+        self.assertEqual(result, expected)
 
     @patch('cupstream2distro.silomanager.SiloState.__init__')
     @patch('cupstream2distro.silomanager.glob')
@@ -313,7 +314,7 @@
                 preferred_email_address=Mock(email='[e-mail]')))
         self.load_bileto()
         req_mock.get.return_value.json.assert_called_once_with()
-        self.assertDictEqual(self.state._bileto, dict(creator='robru'))
+        self.assertEqual(self.state._bileto, dict(creator='robru'))
         self.assertEqual(env.CREATOR_NAME, 'Robert')
         self.assertEqual(env.CREATOR_EMAIL, '[e-mail]')
 
@@ -333,21 +334,29 @@
         self.assertRaises(IOError, self.state.load_config)
 
     @patch('cupstream2distro.silomanager.SiloState.dest', Mock())
-    def test_silostate_push_to_ppa_description(self):
+    @patch('cupstream2distro.silomanager.lp')
+    def test_silostate_push_to_ppa_description(self, lp_mock):
         """Invoke the correct lplib runes for ppa description setting."""
+        env.SILONAME = 'cool/description'
+        ppa = lp_mock.get_ppa.return_value
         self.state._bileto.update(distribution='ubuntu')
-        self.state._ppa = Mock()
         self.state.push_to_ppa_description()
-        self.assertIn('Landers: jim bob', self.state._ppa.description)
-        self.assertNotIn(
-            'https://api.launchpad.net/devel/',
-            self.state._ppa.description)
-        self.state._ppa.lp_save.assert_called_once_with()
+        self.assertIn('Landers: jim bob', ppa.description)
+        self.assertNotIn('https://api.launchpad.net/devel/', ppa.description)
+        ppa.lp_save.assert_called_once_with()
+        # lp.get_ppa() is called twice but this is ok because it caches the
+        # returned object, so it's the same reference to the same obj each time
+        self.assertEqual(lp_mock.get_ppa.mock_calls, [
+            call('ci-train-staging-area/cool/description'),
+            call('ci-train-staging-area/cool/description'),
+            call().lp_save(),
+        ])
 
     @patch('cupstream2distro.silomanager.BILETO_IP', '8.8.8.8')
     @patch('cupstream2distro.silomanager.BILETO_API', 'example.com')
     def test_silostate_push_to_bileto(self):
         """Ensure that we push status messages to Bileto."""
+        self.state.status = 'Packages built'
         self.state.push_to_bileto()
         data = silomanager.requests.post.mock_calls[0][2]['data']
         self.assertIn('"status": "Packages built"', data)
@@ -373,6 +382,7 @@
     @patch('cupstream2distro.silomanager.BILETO_API', 'example.com')
     def test_silostate_push_to_bileto_bad_response(self):
         """Report failures from Bileto."""
+        self.state.status = 'Packages built'
         silomanager.requests.post.return_value.ok = False
         self.state.push_to_bileto()
         data = silomanager.requests.post.mock_calls[0][2]['data']
@@ -393,7 +403,6 @@
         """Save config to disk."""
         tmp = join(self.tempdir, 'config')
         self.state._configfile = tmp
-        self.state._mtime = self.state.get_mtime()
         self.state.push_to_ppa_description = Mock()
         self.state.push_to_bileto = Mock()
         self.state.load_bileto = Mock()
@@ -410,7 +419,6 @@
         """Can save twice in a row without mtime check screwing us."""
         tmp = join(self.tempdir, 'config')
         self.state._configfile = tmp
-        self.state._mtime = self.state.get_mtime()
         self.state.push_to_ppa_description = Mock()
         self.state.push_to_bileto = Mock()
         self.state.save_config()
@@ -419,27 +427,6 @@
         time.sleep(0.01)
         self.state.save_config()
 
-    @patch('cupstream2distro.silomanager.os.makedirs')
-    @patch('cupstream2distro.silomanager.SiloState.load_bileto', Mock())
-    def test_silostate_save_config_bad_mtime(self, mkdir):
-        """Merge status messages if it changed since loading."""
-        tmp = join(self.tempdir, 'config')
-        self.state._configfile = tmp
-        self.state._mtime = self.state.get_mtime()
-        self.state.message = 'First.'
-        self.state.push_to_ppa_description = Mock()
-        self.state.push_to_bileto = Mock()
-        self.state.save_config()
-        self.state.push_to_ppa_description.assert_called_once_with()
-        self.state.push_to_bileto.assert_called_once_with()
-        self.state._mtime = 0
-        self.state.message = 'Second.'
-        self.state.save_config()
-        new = SiloState('phony-siloname', do_load=False)
-        new._configfile = tmp
-        new.load_config()
-        self.assertEqual(new.message, 'First. Second.')
-
     def test_silostate_config_step(self):
         """Read the config step."""
         self.assertEqual(self.state.config_step, 1)
@@ -453,21 +440,16 @@
         """Set the config status."""
         silomanager.env.BUILD_URL = 'http://example.com/jenkins/'
         self.state.set_config_status(-1, 'Everything is broken!')
+        self.assertEqual(self.state._status, 'Everything is broken!')
         self.assertEqual(
-            self.state._config['global']['status'],
-            dict(
-                message='Everything is broken!',
-                ping=True,
-                state=-1,
-                url='http://example.com/jenkins/console'))
+            self.state._config['global']['status']['url'],
+            'http://example.com/jenkins/console')
 
     def test_silostate_set_config_status_scrubbed(self):
         """Scrub the config status."""
         silomanager.env.BUILD_URL = 'http://example.com/jenkins/'
         self.state.set_config_status(-1, 'Exception: token=LEAKED')
-        self.assertEqual(
-            self.state._config['global']['status']['message'],
-            'Exception: token=XXX')
+        self.assertEqual(self.state._status, 'Exception: token=XXX')
 
     @patch('cupstream2distro.silomanager.SiloState')
     def test_silostate_sources_sync_silo(self, ss_mock):
@@ -478,6 +460,31 @@
         self.assertEqual(self.state.sources, ss_mock.return_value.all_projects)
         ss_mock.assert_called_once_with('ubuntu/landing-005')
 
+    def test_silostate_dual(self):
+        """Ensure that dual property reflects correct series."""
+        self.state._bileto.update(series='wily+vivid')
+        self.assertEqual(self.state.dual, 'vivid')
+        self.state._bileto.update(series='dual')
+        self.assertEqual(self.state.dual, 'vivid')
+        self.state._bileto.update(series='wily')
+        self.assertIsNone(self.state.dual)
+
+    @patch('cupstream2distro.silomanager.lp')
+    def test_silostate_series(self, lp_mock):
+        """Ensure that series property reflects correct series."""
+        self.state._bileto.update(distribution='ubuntu')
+        cases = (
+            ('wily+vivid', 'wily'),
+            ('dual', 'wily'),
+            ('wily', 'wily'),
+            ('vivid', 'vivid'),
+        )
+        for inn, out in cases:
+            self.state._bileto.update(series=inn)
+            self.assertEqual(self.state.series, lp_mock.load.return_value)
+            lp_mock.load.assert_called_once_with('ubuntu/' + out)
+            lp_mock.reset_mock()
+
     @patch('cupstream2distro.silomanager.lp')
     def test_silostate_dest_archive(self, lp_mock):
         """Ensure that dest property reflects correct archive."""
@@ -619,10 +626,6 @@
                 'https://api.launchpad.net/devel/~gerboland/platform-api/'
                 'exposeOrientation/+merge/232250'
             ]})
-        self.assertEqual(
-            self.state.ppa.self_link,
-            'https://api.launchpad.net/devel/~ci-train-ppa-service/+archive/'
-            'ubuntu/landing-123')
         self.assertEqual(self.state.state, 3)
         self.assertEqual(self.state.requestid, '1411123362781')
         self.assertEqual(self.state.siloname, 'ubuntu/landing-123')
@@ -636,12 +639,8 @@
         """Set various state properties."""
         self.state.config_step = 9000
         self.assertEqual(self.state._config['global']['step'], 9000)
-        self.state.dual = 'vivid'
-        self.assertEqual(self.state._config['dual'], 'vivid')
         self.state.mps = 'flibbyjib'
         self.assertEqual(self.state._config['mps'], 'flibbyjib')
-        self.state.ppa = Mock(self_link='my ppa')
-        self.assertEqual(self.state._config['global']['ppa'], 'my ppa')
         self.state.requestid = 'bazinga'
         self.assertEqual(self.state._config['requestid'], 'bazinga')
         self.state.source_archive = 'ubuntu'
@@ -684,37 +683,6 @@
             {'foobar': ['example.com', 'example.com/zip'],
              'fringle': ['example.com/futz']})
 
-    @patch('cupstream2distro.silomanager.os.makedirs', Mock())
-    def test_get_mtime(self):
-        """Get the modified time of the config file."""
-        tmp = join(self.tempdir, 'config')
-        first = self.state.get_mtime()
-        self.assertGreater(first, 0)
-        self.state._configfile = tmp
-        self.state._mtime = self.state.get_mtime()
-        self.state.push_to_ppa_description = Mock()
-        self.state.push_to_bileto = Mock()
-        self.state.save_config()
-        self.state.push_to_ppa_description.assert_called_once_with()
-        self.state.push_to_bileto.assert_called_once_with()
-        second = self.state.get_mtime()
-        self.assertGreater(second, first)
-        time.sleep(0.01)
-        self.assertEqual(second, self.state.get_mtime())
-
-    def test_get_mtime_file_missing(self):
-        """Return None if file is missing."""
-        self.state._configfile = '/totally/not/even/there'
-        self.assertIsNone(self.state.get_mtime())
-
-    def test_additional_targets(self):
-        """Get and set the additional targets list."""
-        self.assertEqual(self.state.additional_targets, None)
-        self.state.additional_targets = list('abc')
-        self.assertEqual(self.state.additional_targets, ['a', 'b', 'c'])
-        self.assertEqual(
-            self.state._config['additional_targets'], ['a', 'b', 'c'])
-
     def test_signal_handler(self):
         """Our signal handler is installed globally."""
         self.assertTrue(