Merge lp:~robru/cupstream2distro/begin-xenial-overlay into lp:cupstream2distro

[Robert Bruce Park]

Send both xenial & vivid in dual silos to overlay PPA.

[Łukasz Zemczak (sil2100)]

Looks good!

review: Approve

=== modified file 'cupstream2distro/silomanager.py'
--- cupstream2distro/silomanager.py	2016-03-28 21:32:25 +0000
+++ cupstream2distro/silomanager.py	2016-04-11 20:01:11 +0000
@@ -455,7 +455,7 @@
     def dest(self):
         """Return launchpadlib object representing the destination archive."""
         series = self._series
-        if series == 'vivid':
+        if 'vivid' in series:  # matches 'vivid' and 'xenial+vivid'
             return self.stable_overlay
         if self._dest and '+' not in series:
             return lp.get_ppa(self._dest)

=== modified file 'tests/unit/test_silomanager.py'
--- tests/unit/test_silomanager.py	2016-03-28 21:32:25 +0000
+++ tests/unit/test_silomanager.py	2016-04-11 20:01:11 +0000
@@ -608,7 +608,7 @@
             dest='ignored', distribution='robruntu', series='xenial+vivid')
         robruntu = Mock()
         lp_mock.distributions = dict(robruntu=robruntu)
-        self.assertEqual(self.state.dest, robruntu.main_archive)
+        self.assertEqual(self.state.dest, lp_mock.get_ppa.return_value)
 
     @patch('cupstream2distro.silomanager.lp')
     def test_silostate_dest_ppa(self, lp_mock):