Merge lp:~brian-murray/cupstream2distro/bug-1530870 into lp:cupstream2distro

[Brian Murray]

[Robert Bruce Park (robru)]

Clever job getting the series from the filename, I'll need to think about how stable that'll be (the file path has changed a few times over the years).

There's an unrelated issue that affects this part of the code as well, let me know if you'd like to tackle it within the same branch or if it makes more sense to do it as a separate branch.

The thing is that these files you're reading don't even need to be created in the first place. It used to be that these files would be created at one point, preserved on the server, and then read at a different point, but the architecture of the system has shifted a bit and we currently do a silly sort of thing where one part of the code writes these files, another part of the code immediately reads them, and then when the job is done running it all gets deleted. So it should be possible to just set a value in an instance attribute somewhere rather than even writing/reading to disk at all.

Take a look here:

http://bazaar.launchpad.net/+branch/cupstream2distro/view/head:/cupstream2distro/archive.py#L217

That's where the file is written, in Archive.archive_pocket(). Instead of calling set_file (and indeed if you drop set_file I think set_file can be entirely deleted as this is the last remaining user of the method), just set an instance attribute, and then in SiloManager.published_versions you should be able to iterate over all the build objects and their 'published' attribute. Although SiloManager probably doesn't have a direct reference from one to the other so you might need some poking to connect the dots there.

[lp:~brian-murray/cupstream2distro/bug-1530870]

1354. By Brian Murray on 2016-02-02

remove setdefault usage

[Robert Bruce Park (robru)]

ok lgtm, just going to test in staging.

review: Approve

=== modified file 'cupstream2distro/silomanager.py'
--- cupstream2distro/silomanager.py	2016-01-24 08:33:40 +0000
+++ cupstream2distro/silomanager.py	2016-02-02 22:55:48 +0000
@@ -355,14 +355,15 @@
 
     @property
     def published_versions(self):
-        """Return a list of what versions have been published."""
-        versions = defaultdict(list)
+        """Return a dictionary of what versions have been published."""
+        versions = defaultdict(dict)
         fileglob = join(SILOS_DIR, self.siloname, '*', '*', '*published')
         for filename in sorted(glob(fileglob)):
             source = basename(filename).split('_')[0].split('+')[0]
+            series = filename.split('/')[-3]
             with utf8_open(filename) as data:
                 version = data.read().strip()
-            versions[source].append(version)
+            versions[source][series] = version
         return json.dumps(versions, sort_keys=True)
 
     @property

=== modified file 'tests/unit/test_silomanager.py'
--- tests/unit/test_silomanager.py	2016-01-24 08:33:40 +0000
+++ tests/unit/test_silomanager.py	2016-02-02 22:55:48 +0000
@@ -624,8 +624,8 @@
                     data.write(version)
         self.assertEqual(
             self.state.published_versions,
-            '{"alpha": ["1.0+15.04", "1.0+16.04"], '
-            '"beta": ["1.0+15.04", "1.0+16.04"]}')
+            '{"alpha": {"vivid": "1.0+15.04", "xenial": "1.0+16.04"}, '
+            '"beta": {"vivid": "1.0+15.04", "xenial": "1.0+16.04"}}')
 
     @patch('cupstream2distro.silomanager.SiloState.sources', ['foobar'])
     @patch('cupstream2distro.silomanager.SiloState.mps', dict(merger=[]))