Merge lp:~robru/cupstream2distro/new-config-class into lp:cupstream2distro

[Robert Bruce Park]

New Config class for reading config from disk.

[Robert Bruce Park (robru)]

Needs tests, and not yet tested in staging.

[lp:~robru/cupstream2distro/new-config-class]

1345. By Robert Bruce Park on 2016-01-23

Rebase on trunk.

1346. By Robert Bruce Park on 2016-01-23

100% tests.

[Robert Bruce Park (robru)]

works great in staging.

review: Approve

[lp:~robru/cupstream2distro/new-config-class]

1347. By Robert Bruce Park on 2016-01-23

Fix test in trusty.

=== modified file 'Makefile'
--- Makefile	2016-01-10 10:12:24 +0000
+++ Makefile	2016-01-23 01:33:24 +0000
@@ -7,7 +7,7 @@
 	find -name '*.xml*' | xargs xmllint --noout
 	find -name '*.py' | xargs python3 -m pyflakes
 	find -name '*.py' | xargs python3 -m pep8 --ignore=E731  # Don't tell me what to do
-	find -name '*.py' | xargs python3 -m pylint --persistent=no --disable attribute-defined-outside-init,broad-except,deprecated-method,fixme,import-error,invalid-name,no-init,no-member,no-self-use,no-value-for-parameter,protected-access,redefined-variable-type,star-args,too-few-public-methods,too-many-arguments,too-many-instance-attributes,too-many-public-methods,unbalanced-tuple-unpacking,unused-argument,unused-variable
+	find -name '*.py' | xargs python3 -m pylint --persistent=no --disable attribute-defined-outside-init,broad-except,deprecated-method,fixme,import-error,invalid-name,no-init,no-member,no-self-use,no-value-for-parameter,protected-access,redefined-variable-type,star-args,too-few-public-methods,too-many-arguments,too-many-instance-attributes,too-many-public-methods,unbalanced-tuple-unpacking,unsubscriptable-object,unused-argument,unused-variable
 
 performance:
 	BEAT_THE_CLOCK=500 make check

=== modified file 'citrain/recipes/manager.py'
--- citrain/recipes/manager.py	2015-11-22 13:37:37 +0000
+++ citrain/recipes/manager.py	2016-01-23 01:33:24 +0000
@@ -28,9 +28,7 @@
 from citrain.recipes.secondary import Secondary
 from citrain.recipes.sourcesync import SourceSync
 from citrain.recipes.binarysync import BinarySync
-from cupstream2distro.settings import STABLE_OVERLAY_PPA
 from cupstream2distro.utils import env, log_value_of
-from cupstream2distro.launchpadmanager import lp
 from cupstream2distro.errors import CITrainError
 
 
@@ -83,11 +81,11 @@
         dest = self.silo_state.dest
         ppa = self.silo_state.ppa
         dual = self.silo_state.dual
+        overlay = self.silo_state.stable_overlay
         for Build, source_names in self.types.items():
             for name in sorted(source_names):
                 build = self.builds[name] = Build(name, series, dest, ppa)
                 if dual:
-                    overlay = lp.get_ppa(STABLE_OVERLAY_PPA)
                     secondary = Secondary if Build is Merge else Manual
                     second = secondary(name, dual, overlay, ppa, build)
                     self.builds['zzz_' + name] = second

=== modified file 'citrain/setup_citrain.py'
--- citrain/setup_citrain.py	2016-01-05 22:03:49 +0000
+++ citrain/setup_citrain.py	2016-01-23 01:33:24 +0000
@@ -33,17 +33,15 @@
 
 from cupstream2distro.launchpadmanager import lp
 from cupstream2distro.utils import (
+    Config,
     log_value_of,
     run_script,
     suppress,
     utf8_open,
 )
 from cupstream2distro.settings import (
-    ALL_SILO_NAMES,
     CITRAIN_BINDIR,
-    PPA_TEAM,
     ROOT_CU2D,
-    SILO_NAME_LIST,
     SILO_NAMES_FILE,
     SILO_RSYNCDIR,
     SILOS_DIR,
@@ -56,18 +54,15 @@
 
 def discover_silos():
     """Query Launchpad to see how many silos are available."""
-    SILO_NAME_LIST.clear()
-    while ALL_SILO_NAMES:
-        ALL_SILO_NAMES.pop()
-    for ppa in lp.people[PPA_TEAM].ppas:
+    silonames = []
+    for ppa in lp.people[Config['ppa.team']].ppas:
         dist = ppa.distribution_link.split('/')[-1]
         siloname = '{}/{}'.format(dist, ppa.name)
         if '/landing-' in siloname and '-deleted' not in siloname:
-            SILO_NAME_LIST.setdefault(dist, [])
-            SILO_NAME_LIST[dist].append(siloname)
-            ALL_SILO_NAMES.append(siloname)
+            silonames.append(siloname)
     with utf8_open(SILO_NAMES_FILE, 'w') as filename:
-        filename.write(json.dumps(sorted(ALL_SILO_NAMES)))
+        filename.write(json.dumps(sorted(silonames)))
+    return silonames
 
 
 def template(template_name):
@@ -114,8 +109,7 @@
 
 def main():
     """Generate all Jenkins XML job files."""
-    discover_silos()
-    for siloname in ALL_SILO_NAMES:
+    for siloname in discover_silos():
         setup_silo(siloname)
     setup_job('cyphermox-test')
     setup_job('prepare-silo')

=== modified file 'cupstream2distro/settings.py'
--- cupstream2distro/settings.py	2016-01-20 02:32:00 +0000
+++ cupstream2distro/settings.py	2016-01-23 01:33:24 +0000
@@ -20,22 +20,10 @@
 Doesn't import anything from any other part of the project.
 """
 
-import json
-import codecs
 import logging
 
 from os import environ
 from os.path import dirname, expanduser, isdir, join, realpath
-from collections import defaultdict
-
-
-def read_from_disk(filename):
-    """Read a value from a file on disk."""
-    try:
-        with codecs.open(filename, encoding='utf-8') as data:
-            return data.read().strip()
-    except (IOError, OSError):
-        return None
 
 
 logging.basicConfig(
@@ -56,46 +44,14 @@
 
 ROOT_CU2D = dirname(dirname(realpath(__file__)))
 
-PPA_TEAM_FILE = join(HOME_DIR, 'ppa.team')
-PPA_TEAM = read_from_disk(PPA_TEAM_FILE) or 'ci-train-staging-area'
-LANDING_SCHEME = PPA_TEAM + '/{}'
-
-STABLE_OVERLAY_PPA = PPA_TEAM + '/ubuntu/stable-phone-overlay'
-
-
-def read_silo_names(filename):
-    """Read the list of available silo PPA names from a file on disk."""
-    silos = []
-    bydistro = defaultdict(list)
-    try:
-        silos = json.loads(read_from_disk(filename))
-        for siloname in silos:
-            bydistro[siloname.split('/')[0]].append(siloname)
-    except (IOError, OSError, ValueError, TypeError):
-        logging.warning('Silo name list not found, run setup_citrain.py.')
-    logging.debug(str(silos))
-    logging.debug(str(bydistro))
-    return silos, dict(bydistro)
-
-
 SILO_NAMES_FILE = expanduser('~/.ci-train-silo-names')
-ALL_SILO_NAMES, SILO_NAME_LIST = read_silo_names(SILO_NAMES_FILE)
-
-SILO_BUILDPPA_SCHEME = PPA_TEAM + '/{}/{}'
+
+
 SILOS_DIR = expanduser('~/silos')
 SILO_RSYNCDIR = '~/out'
 CITRAIN_BINDIR = join(ROOT_CU2D, 'citrain')
 
-
-# These paths are hard-coded in lp:cupstream2distro/charm, don't change them
-BILETO_TOKEN_PATH = expanduser('~/bileto.token')
-BILETO_TOKEN = read_from_disk(BILETO_TOKEN_PATH)
-
-BILETO_IP_PATH = expanduser('~/bileto.ip')
-BILETO_IP = read_from_disk(BILETO_IP_PATH)
-
-BILETO_GET = 'http://{}:8080/v1/ticket/{{}}'.format(BILETO_IP)
-BILETO_API = 'http://{}:8080/v1/tickets?token={}'.format(
-    BILETO_IP, BILETO_TOKEN)
-COMMENT_API = 'http://{}:8080/v1/comment?token={}'.format(
-    BILETO_IP, BILETO_TOKEN)
+# Default values for config files read from disk.
+DEFAULTS = {
+    'ppa.team': 'ci-train-staging-area',
+}

=== modified file 'cupstream2distro/silomanager.py'
--- cupstream2distro/silomanager.py	2016-01-23 00:38:01 +0000
+++ cupstream2distro/silomanager.py	2016-01-23 01:33:24 +0000
@@ -38,17 +38,11 @@
 from lazr.restfulclient.errors import PreconditionFailed, NotFound
 
 from cupstream2distro.branchhandling import get_package_name_from_branch
+from cupstream2distro.settings import SILO_NAMES_FILE, SILOS_DIR
 from cupstream2distro.errors import CITrainError, PrepError
 from cupstream2distro.launchpadmanager import lp
-from cupstream2distro.settings import (
-    BILETO_API,
-    BILETO_GET,
-    LANDING_SCHEME,
-    SILO_NAME_LIST,
-    SILOS_DIR,
-    STABLE_OVERLAY_PPA,
-)
 from cupstream2distro.utils import (
+    Config,
     env,
     memoize,
     log_value_of,
@@ -112,9 +106,11 @@
 
 def update_bileto(**kwargs):
     """Update a ticket in Bileto."""
+    api = 'http://{}:8080/v1/tickets?token={}'.format(
+        Config['bileto.ip'], Config['bileto.token'])
     try:
         response = requests.post(
-            BILETO_API, data=json.dumps(kwargs), headers=JSON)
+            api, data=json.dumps(kwargs), headers=JSON)
     except IOError as err:
         logging.error('Failed to contact Bileto: %s', scrub(str(err)))
         return
@@ -140,14 +136,25 @@
     REQUEST_ID_GLOB = REQUEST_ID_FILE.format('*')
     _lock_fd = None
 
+    @staticmethod
+    @memoize
+    def discover_ppas(distribution='ubuntu'):
+        """Read the cached list of PPAs we have."""
+        try:
+            silos = json.loads(Config[SILO_NAMES_FILE])
+        except (IOError, OSError, ValueError, TypeError):
+            raise PrepError('Silo name list not found, run setup_citrain.py')
+        log_value_of.silos()
+        return [silo for silo in silos if silo.startswith(distribution + '/')]
+
     @classmethod
     def find_first_available(cls, distribution='ubuntu'):
         """Return a siloname for an unassigned silo."""
         log_value_of.distribution()
-        logging.debug(SILO_NAME_LIST[distribution])
-        shuffle(SILO_NAME_LIST[distribution])
-        logging.debug(SILO_NAME_LIST[distribution])
-        for siloname in SILO_NAME_LIST[distribution]:
+        silonames = cls.discover_ppas(distribution)
+        shuffle(silonames)
+        log_value_of.silonames('Shuffled')
+        for siloname in silonames:
             log_value_of.siloname('Checking if available')
             filename = join(SILOS_DIR, siloname, cls.REQUEST_ID_GLOB)
             if not glob(filename):
@@ -215,7 +222,6 @@
     def assign(self, requestid):
         """Assign a new requestid to an available silo."""
         self.requestid = requestid
-        self.validate_permissions()
         self.find_existing_assignment()
         if not self.siloname:
             self.siloname = SiloState.find_first_available(self._distribution)
@@ -223,18 +229,6 @@
         self.set_status('Ready to build')
         logging.info(self.summarize(status=False))
 
-    def validate_permissions(self):
-        """Ensure the user has permission to assign."""
-        logging.info('Checking LP teams for %s', env.BUILD_USER_ID)
-        memberships = lp.people[env.BUILD_USER_ID].memberships_details
-        teams = {member.team_link.split('~')[-1] for member in memberships}
-        if not teams & {'ubuntu-core-dev', 'ci-train-ppa-service'}:
-            assigned = len(glob(join(
-                SILOS_DIR, self._distribution, '*', self.REQUEST_ID_GLOB)))
-            total = len(SILO_NAME_LIST[self._distribution])
-            if total - assigned < 5:
-                raise PrepError('Low on silos: Ask a trainguard to assign.')
-
     def find_existing_assignment(self):
         """Find & re-use existing assignment if any."""
         rid = self.requestid
@@ -273,7 +267,9 @@
         """Fetch request from Bileto."""
         rid = self.requestid
         log_value_of.rid('Loading from Bileto')
-        response = requests.get(BILETO_GET.format(rid)).json()
+        response = requests.get(
+            'http://{}:8080/v1/ticket/{}'.format(Config['bileto.ip'], rid)
+        ).json()
         self._bileto = (response.get('requests') or [{}])[0]
         creator = self.creator
         log_value_of.creator('Bileto says')
@@ -292,7 +288,7 @@
                 raise PrepError('Field "{}" is mandatory.'.format(field))
         if not (self._merge_proposals or self.sources or self._sync_request):
             raise PrepError('Need either merges, sources, or a sync.')
-        if self._distribution not in SILO_NAME_LIST:
+        if self._distribution not in ('ubuntu',):
             raise PrepError('{} is unsupported.'.format(self._distribution))
         if self.dual:
             if self._sync_request:
@@ -417,7 +413,7 @@
     def ppa(self):
         """Return the lplib object representing the silo ppa."""
         siloname = self.siloname or self._siloname
-        return lp.get_ppa(LANDING_SCHEME.format(siloname))
+        return lp.get_ppa('{}/{}'.format(Config['ppa.team'], siloname))
 
     @property
     @memoize
@@ -453,11 +449,17 @@
 
     @property
     @memoize
+    def stable_overlay(self):
+        """Return launchpadlib object representing stable overlay ppa."""
+        return lp.get_ppa(Config['ppa.team'] + '/ubuntu/stable-phone-overlay')
+
+    @property
+    @memoize
     def dest(self):
         """Return launchpadlib object representing the destination archive."""
         series = self._series
         if series == 'wily+vivid':
-            return lp.get_ppa(STABLE_OVERLAY_PPA)
+            return self.stable_overlay
         if self._dest and '+' not in series:
             return lp.get_ppa(self._dest)
         return lp.distributions[self._distribution].main_archive
@@ -478,9 +480,9 @@
         elif archive.isdigit():
             siloname = '{}/landing-{:03d}'.format(
                 self._distribution, int(archive))
-            return lp.get_ppa(LANDING_SCHEME.format(siloname))
+            return lp.get_ppa('{}/{}'.format(Config['ppa.team'], siloname))
         elif archive == 'stable-overlay':
-            return lp.get_ppa(STABLE_OVERLAY_PPA)
+            return self.stable_overlay
         elif archive:
             with suppress(KeyError):
                 return lp.distributions[archive].main_archive

=== modified file 'cupstream2distro/utils.py'
--- cupstream2distro/utils.py	2016-01-10 10:12:24 +0000
+++ cupstream2distro/utils.py	2016-01-23 01:33:24 +0000
@@ -22,7 +22,7 @@
 import subprocess
 
 import os
-from os.path import exists, isfile, join
+from os.path import exists, expanduser, isfile, join
 
 from hashlib import sha256
 from functools import wraps
@@ -33,7 +33,7 @@
 from six import text_type
 from six.moves.urllib.parse import unquote
 
-from cupstream2distro.settings import SILOS_DIR
+from cupstream2distro.settings import DEFAULTS, SILOS_DIR
 
 
 TOKEN_SCRUB = re.compile('token=[a-z0-9-]+', flags=re.IGNORECASE)
@@ -160,6 +160,21 @@
         return 'Environment Variables:\n' + pformat(dict(os.environ))
 
 
+@singleton
+class Config:
+    """Read configuration values from disk."""
+    dirs = ('/etc/cupstream2distro', expanduser('~'))
+
+    @memoize
+    def __getitem__(self, key):
+        """Read configuration value from disk."""
+        for root in self.dirs:
+            with suppress(FileNotFoundError):
+                with utf8_open(join(root, key)) as data:
+                    return data.read().strip()
+        return DEFAULTS.get(key)
+
+
 def SILO_DIR(*parts):
     """Return the directory of the currently active silo."""
     assert env.SILONAME

=== modified file 'tests/unit/test_recipe_manager.py'
--- tests/unit/test_recipe_manager.py	2016-01-10 10:12:24 +0000
+++ tests/unit/test_recipe_manager.py	2016-01-23 01:33:24 +0000
@@ -95,13 +95,11 @@
         source.assert_called_once_with(
             'b', silo_state.series, silo_state.dest, silo_state.ppa)
 
-    @patch('citrain.recipes.manager.lp')
     @patch('citrain.recipes.manager.Merge')
     @patch('citrain.recipes.manager.Manual')
     @patch('citrain.recipes.manager.Secondary')
-    def test_manager_instantiate_build_dual(self, second, man, merge, lp):
+    def test_manager_instantiate_build_dual(self, second, man, merge):
         """Create Secondary build objects."""
-        overlay = lp.get_ppa.return_value
         dual = Mock()
         dual.name = 'vivid'
         state = Mock(
@@ -124,11 +122,11 @@
                 'zzz_c': man.return_value,
             })
         self.assertEqual(sorted(second.mock_calls), [
-            call('a', dual, overlay, state.ppa, bman.builds['a']),
+            call('a', dual, state.stable_overlay, state.ppa, bman.builds['a']),
         ])
         self.assertEqual(sorted(man.mock_calls), [
-            call('b', dual, overlay, state.ppa, bman.builds['b']),
-            call('c', dual, overlay, state.ppa, bman.builds['c']),
+            call('b', dual, state.stable_overlay, state.ppa, bman.builds['b']),
+            call('c', dual, state.stable_overlay, state.ppa, bman.builds['c']),
         ])
 
     @patch('citrain.recipes.manager.BuildBase')

=== modified file 'tests/unit/test_script_build.py'
--- tests/unit/test_script_build.py	2016-01-15 00:57:08 +0000
+++ tests/unit/test_script_build.py	2016-01-23 01:33:24 +0000
@@ -56,8 +56,7 @@
         bman.do()
         self.assertEqual(bman.names, {'a', 'b', 'd'})
 
-    @patch('citrain.recipes.manager.lp')
-    def test_buildmanager_instantiate_build_objects_twins(self, lp):
+    def test_buildmanager_instantiate_build_objects_twins(self):
         """Always add twins for all builds."""
         sources = ['qtmir', 'qtmir-gles', 'foo']
         silo_state = Mock(all_projects=sources, sources=sources, mps=[])

=== modified file 'tests/unit/test_script_setup_citrain.py'
--- tests/unit/test_script_setup_citrain.py	2016-01-10 10:12:24 +0000
+++ tests/unit/test_script_setup_citrain.py	2016-01-23 01:33:24 +0000
@@ -17,18 +17,15 @@
 """Tests for CI Train Setup script."""
 
 import glob
-import json
 
 import os
 from os.path import join
 
-from collections import defaultdict
 from mock import Mock, call
 
 from tests.unit import CITrainScriptTestCase
 
-from cupstream2distro.utils import utf8_open
-from cupstream2distro.settings import PPA_TEAM, read_silo_names
+from cupstream2distro.utils import Config, utf8_open
 
 # Unused import necessary for code coverage reporting
 from citrain import setup_citrain
@@ -39,33 +36,18 @@
     """Test CI Train Setup Script."""
     scriptname = 'setup_citrain.py'
 
-    def test_read_silo_names(self):
-        """Ensure that we can read the silo name list from disk."""
-        listfile = join(self.tempdir, 'list')
-        expected = ['ubuntu/one', 'ubuntu/two']
-        with utf8_open(listfile, 'w') as data:
-            data.write(json.dumps(expected))
-        silos, distro = read_silo_names(listfile)
-        self.assertEqual(silos, expected)
-        self.assertEqual(distro, dict(ubuntu=silos))
-
     def test_discover_silos(self):
         """Ensure that we can query launchpad for existing PPAs."""
         alpha = Mock(distribution_link='foo/ubuntu')
         alpha.name = 'landing-000'
         omega = Mock(distribution_link='foo/ubuntu')
         omega.name = 'landing-999'
-        self.script.lp.people = {PPA_TEAM: Mock(ppas=[alpha, omega])}
-        self.script.SILO_NAME_LIST = defaultdict(list)
+        self.script.lp.people = {Config['ppa.team']: Mock(ppas=[alpha, omega])}
         self.script.SILO_NAMES_FILE = '/tmp/ci-train-silo-names'
-        self.script.discover_silos()
-        self.assertEqual(self.script.ALL_SILO_NAMES, [
+        self.assertEqual(self.script.discover_silos(), [
             'ubuntu/landing-000',
             'ubuntu/landing-999',
         ])
-        self.assertEqual(
-            self.script.SILO_NAME_LIST,
-            dict(ubuntu=self.script.ALL_SILO_NAMES))
 
     def test_template_names(self):
         """Ensure we can find template filenames properly."""
@@ -128,12 +110,15 @@
 
     def test_main(self):
         """Tie deployment all together."""
-        self.script.discover_silos = Mock()
+        silos = [
+            'ubuntu/landing-{:03d}'.format(x) for x in range(0, 10)
+        ]
+        self.script.discover_silos = Mock(return_value=silos)
         self.script.setup_silo = Mock()
         self.script.setup_job = Mock()
         self.assertEqual(self.script.main(), 0)
         self.assertEqual(self.script.setup_silo.mock_calls, [
-            call('ubuntu/landing-{:03d}'.format(x)) for x in range(0, 10)
+            call(silo) for silo in silos
         ])
         self.assertEqual(self.script.setup_job.mock_calls, [
             call('cyphermox-test'),
@@ -169,7 +154,9 @@
                         yield val.format(num)
 
         expected = sorted(gen_expected())
-        self.script.discover_silos = Mock()
+        self.script.discover_silos = Mock(return_value=[
+            'ubuntu/landing-{:03d}'.format(x) for x in range(0, 10)
+        ])
         self.script.JOBS_DIR = self.tempdir
         self.script.os.makedirs = os.makedirs
         self.assertEqual(self.script.main(), 0)

=== modified file 'tests/unit/test_silomanager.py'
--- tests/unit/test_silomanager.py	2016-01-23 00:38:01 +0000
+++ tests/unit/test_silomanager.py	2016-01-23 01:33:24 +0000
@@ -126,10 +126,11 @@
         def body(silo_state):
             """Raise a little hell."""
             raise PrepError('Boo!')
+        PrepError.prefix = 'Bailed: '
         self.assertEqual(stock_main(body), PrepError.code)
         self.assertEqual(state_mock.mock_calls, [
             call(self.tempdir, primary=True),
-            call().set_status('Assignment failed: Boo!'),
+            call().set_status('Bailed: Boo!'),
         ])
 
     def test_silostate_init(self):
@@ -159,10 +160,9 @@
 
     @patch('cupstream2distro.silomanager.SiloState.summarize')
     @patch('cupstream2distro.silomanager.SiloState.set_status')
-    @patch('cupstream2distro.silomanager.SiloState.validate_permissions')
     @patch('cupstream2distro.silomanager.SiloState.find_existing_assignment')
     @patch('cupstream2distro.silomanager.SiloState.find_first_available')
-    def test_silostate_assign(self, first, ass_new, valid, save, summ):
+    def test_silostate_assign(self, first, ass_new, save, summ):
         """Do something sensible during silo assignment."""
         state = SiloState()
         state._bileto['status'] = 'orig'
@@ -172,37 +172,10 @@
         state.assign('REQUEST_ID')
         self.assertEqual(state.requestid, 'REQUEST_ID')
         state.set_status.assert_called_once_with('Ready to build')
-        valid.assert_called_once_with()
         ass_new.assert_called_once_with()
         first.assert_called_once_with('blahp')
         summ.assert_called_once_with(status=False)
 
-    @patch('cupstream2distro.silomanager.lp')
-    @patch('cupstream2distro.silomanager.glob')
-    def test_silostate_validate_permissions(self, glob_mock, lp_mock):
-        """Only allow assigning if there's lots of silos free."""
-        env.BUILD_USER_ID = 'bobru'
-        bobru = Mock(memberships_details=[
-            Mock(team_link='http://example.com/~ci-train-ppa-service'),
-        ])
-        lp_mock.people = dict(bobru=bobru)
-        self.state.validate_permissions()
-        self.assertEqual(glob_mock.mock_calls, [])
-
-    @patch('cupstream2distro.silomanager.lp')
-    @patch('cupstream2distro.silomanager.glob')
-    @patch('cupstream2distro.silomanager.SILO_NAME_LIST', dict(ubuntu=[]))
-    def test_silostate_validate_permissions_fail(self, glob_mock, lp_mock):
-        """Only allow assigning if there's lots of silos free."""
-        env.BUILD_USER_ID = 'bobru'
-        bobru = Mock(memberships_details=[])
-        lp_mock.people = dict(bobru=bobru)
-        glob_mock.return_value = ['/path/to/foo'] * 60
-        with self.assertRaisesRegexp(PrepError, 'Low on silos'):
-            self.state.validate_permissions()
-        glob_mock.assert_called_once_with(
-            self.tempdir + '/ubuntu/*/request_id_*')
-
     def test_silostate_requestid(self):
         """Ensure requestid property behaves sensible."""
         func = 'cupstream2distro.silomanager.join'
@@ -303,10 +276,26 @@
         self.state.find_existing_assignment()
         self.assertIsNone(self.state.siloname)
 
+    @patch('cupstream2distro.silomanager.json.loads')
+    def test_silostate_discover_ppas(self, json_mock):
+        """Read silo name list from disk."""
+        json_mock.return_value = ['ubuntu-rtm/001', 'ubuntu/002']
+        self.assertEqual(SiloState.discover_ppas(), ['ubuntu/002'])
+
+    @patch('cupstream2distro.silomanager.json.loads')
+    def test_silostate_discover_ppas_broken(self, json_mock):
+        """Read silo name list from disk."""
+        json_mock.side_effect = ValueError
+        with self.assertRaises(PrepError):
+            SiloState.discover_ppas('broke')
+
+    @patch('cupstream2distro.silomanager.SiloState.discover_ppas')
     @patch('cupstream2distro.silomanager.os.makedirs')
     @patch('cupstream2distro.silomanager.glob')
-    def test_silostate_find_first_available(self, glob_mock, mkdir):
+    def test_silostate_find_first_available(self, glob_mock, mkdir, disco):
         """Find the first unassigned silo."""
+        disco.return_value = [
+            'ubuntu/landing-{:03d}'.format(x) for x in range(0, 10)]
         glob_mock.return_value = ['/path/to/file']
         with self.assertRaisesRegexp(PrepError, 'No silos are avail'):
             SiloState.find_first_available()
@@ -315,21 +304,21 @@
                  '/ubuntu/landing-{:03d}/request_id_*'.format(x))
             for x in range(0, 10)
         ]
-        self.assertEqual(len(expected), len(glob_mock.mock_calls))
-        for a_call in expected:
-            self.assertIn(a_call, glob_mock.mock_calls)
+        self.assertListEqual(expected, sorted(glob_mock.mock_calls))
         self.assertEqual(mkdir.mock_calls, [])
 
+    @patch('cupstream2distro.silomanager.SiloState.discover_ppas')
     @patch('cupstream2distro.silomanager.shuffle', sorted)
     @patch('cupstream2distro.silomanager.os.makedirs')
     @patch('cupstream2distro.silomanager.glob')
-    def test_silostate_find_first_available_found(self, glob_mock, mkdir):
+    def test_silostate_find_first_available_found(self, glob, mkdir, disco):
         """Find first unassgined silo with one available."""
-        glob_mock.return_value = []
+        disco.return_value = ['ubuntu/landing-000']
+        glob.return_value = []
         self.assertEqual(
             'ubuntu/landing-000',
             SiloState.find_first_available(distribution='ubuntu'))
-        self.assertEqual(glob_mock.mock_calls, [
+        self.assertEqual(glob.mock_calls, [
             call(self.tempdir + '/ubuntu/landing-000/request_id_*'),
         ])
         mkdir.assert_called_once_with(
@@ -474,7 +463,6 @@
 
     @patch('cupstream2distro.silomanager.SiloState.sources', [])
     @patch('cupstream2distro.silomanager.SiloState.requestid', '121')
-    @patch('cupstream2distro.silomanager.BILETO_API', 'example.com')
     def test_silostate_push_to_bileto(self):
         """Ensure that we push status messages to Bileto."""
         env.BUILD_USER_ID = 'robru'
@@ -485,12 +473,11 @@
         self.assertIn('"request_id": "121"', data)
         self.assertIn('"siloname": "ubuntu/landing-123"', data)
         self.assertEqual(silomanager.requests.post.mock_calls, [
-            call('example.com', data=data,
+            call('http://None:8080/v1/tickets?token=None', data=data,
                  headers={'content-type': 'application/json'}),
         ])
 
     @patch('cupstream2distro.silomanager.SiloState.requestid', '121')
-    @patch('cupstream2distro.silomanager.BILETO_API', 'example.com')
     @patch('cupstream2distro.silomanager.SiloState.sources', [])
     @patch('cupstream2distro.silomanager.requests')
     @patch('cupstream2distro.silomanager.logging')
@@ -505,7 +492,6 @@
 
     @patch('cupstream2distro.silomanager.SiloState.sources', [])
     @patch('cupstream2distro.silomanager.SiloState.requestid', '121')
-    @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'
@@ -515,7 +501,7 @@
         self.assertIn('"status": "Packages built"', data)
         self.assertIn('"request_id": "121"', data)
         self.assertEqual(silomanager.requests.post.mock_calls, [
-            call('example.com', data=data,
+            call('http://None:8080/v1/tickets?token=None', data=data,
                  headers={'content-type': 'application/json'}),
         ])
 

=== modified file 'tests/unit/test_utils.py'
--- tests/unit/test_utils.py	2015-10-28 19:40:12 +0000
+++ tests/unit/test_utils.py	2016-01-23 01:33:24 +0000
@@ -23,6 +23,7 @@
 
 from cupstream2distro.utils import (
     SILO_DIR,
+    Config,
     call,
     env,
     log_call,
@@ -217,3 +218,8 @@
         for line, new in utf8_inplace(path):
             new.write(line)
         self.assertEqual(os.stat(path).st_mode, orig_mode)
+
+    def test_config(self):
+        """Ensure that we can read config values from disk."""
+        Config.dirs = ('/etc/',)
+        self.assertTrue(Config['passwd'].startswith('root'))