Merge lp:~smoser/simplestreams/trunk.ppc64el-no-whitelist into lp:~smoser/simplestreams/trunk

[Scott Moser]

tools/make-test-data: Fix missing lxc/lxd files for ppc64el builds.

We had a whitelist on ppc64el ever since the first ppc64el builds.
Removing that whitelist means we will now get correct file information
for all ppc64el builds.

[Scott Moser (smoser)]

for reference, this now produces:
$ sstream-query "--output-format=%(release)s %(ftype)s" exdata/fake/daily/streams/v1/index.json arch=ppc64el
trusty tar.gz
trusty disk1.img
trusty manifest
trusty root.tar.gz
trusty root.tar.xz
trusty lxd.tar.xz
vivid tar.gz
vivid disk1.img
vivid manifest
vivid root.tar.gz
vivid root.tar.xz
vivid lxd.tar.xz
vivid tar.gz
vivid disk1.img
vivid manifest
vivid root.tar.gz
vivid root.tar.xz
vivid lxd.tar.xz
vivid tar.gz
vivid disk1.img
vivid manifest
vivid root.tar.gz
vivid root.tar.xz
vivid lxd.tar.xz
vivid tar.gz
vivid disk1.img
vivid manifest
vivid root.tar.gz
vivid root.tar.xz
vivid lxd.tar.xz
wily tar.gz
wily disk1.img
wily manifest
wily root.tar.gz
wily root.tar.xz
wily lxd.tar.xz
wily tar.gz
wily disk1.img
wily manifest
wily root.tar.gz
wily root.tar.xz
wily lxd.tar.xz
xenial tar.gz
xenial disk1.img
xenial manifest
xenial root.tar.gz
xenial root.tar.xz
xenial lxd.tar.xz
xenial tar.gz
xenial disk1.img
xenial manifest
xenial root.tar.gz
xenial root.tar.xz
xenial lxd.tar.xz

=== modified file 'debian/control'
--- debian/control	2015-12-08 20:29:22 +0000
+++ debian/control	2016-01-14 16:59:45 +0000
@@ -8,11 +8,13 @@
                python-all,
                python-mock,
                python-nose,
+               python-requests (>= 1.1),
                python-setuptools,
                python-yaml,
                python3,
                python3-mock,
                python3-nose,
+               python3-requests (>= 1.1),
                python3-setuptools,
                python3-yaml
 Homepage: http://launchpad.net/simplestreams

=== modified file 'tests/unittests/test_contentsource.py'
--- tests/unittests/test_contentsource.py	2015-12-08 20:10:40 +0000
+++ tests/unittests/test_contentsource.py	2016-01-14 16:59:45 +0000
@@ -6,7 +6,7 @@
 from simplestreams import objectstores
 from simplestreams import contentsource
 from subprocess import Popen, PIPE, STDOUT
-from unittest import TestCase
+from unittest import TestCase, skipIf
 from nose.tools import raises
 
 
@@ -69,8 +69,7 @@
 
     def getcs(self, path, url_reader=None):
         return contentsource.UrlContentSource(
-            self.server.url_for(path),
-            url_reader=contentsource.RequestsUrlReader)
+            self.server.url_for(path), url_reader=url_reader)
 
     def test_default_url_read_handles_None(self):
         scs = contentsource.UrlContentSource(self.server.url_for(self.fpath))
@@ -94,21 +93,25 @@
         data = scs.read(-1)
         self.assertEqual(data, self.fdata)
 
+    @skipIf(contentsource.requests is None, "requests not available")
     def test_requests_url_read_handles_None(self):
         scs = self.getcs(self.fpath, contentsource.RequestsUrlReader)
         data = scs.read(None)
         self.assertEqual(data, self.fdata)
 
+    @skipIf(contentsource.requests is None, "requests not available")
     def test_requests_url_read_handles_negative_size(self):
         scs = self.getcs(self.fpath, contentsource.RequestsUrlReader)
         data = scs.read(None)
         self.assertEqual(data, self.fdata)
 
+    @skipIf(contentsource.requests is None, "requests not available")
     def test_requests_url_read_handles_no_size(self):
         scs = self.getcs(self.fpath, contentsource.RequestsUrlReader)
         data = scs.read()
         self.assertEqual(data, self.fdata)
 
+    @skipIf(contentsource.requests is None, "requests not available")
     def test_requests_url_read_handles_int(self):
         scs = self.getcs(self.fpath, contentsource.RequestsUrlReader)
         data = scs.read(3)
@@ -259,6 +262,7 @@
         self.assertEqual(content, self.fdata)
 
 
+@skipIf(contentsource.requests is None, "requests not available")
 class TestRequestsUrlReader(BaseReaderTest, TestCase):
     reader = contentsource.RequestsUrlReader
     http = True

=== modified file 'tools/toolutil.py'
--- tools/toolutil.py	2015-11-20 18:01:09 +0000
+++ tools/toolutil.py	2016-01-14 16:59:45 +0000
@@ -70,9 +70,6 @@
     if arch == "ppc64el":
         if rel < "trusty" or serial <= "20140326":
             return False
-        ppc64el_suffs = (".tar.gz", "-root.tar.gz", "-disk1.img", ".manifest")
-        if suffix not in ppc64el_suffs:
-            return False
 
     if suffix == ".ova":
         # OVA images become available after 20150407.4 (vivid beta-3)