Merge lp:~abentley/juju-core/cleanups into lp:~juju-qa/juju-core/cd-release-juju

[Aaron Bentley]

Add tests, fix lint.

This branch cleans the hasty fixes needed to use signed streams.

It adds tests for require_branch, updates the get_path_hashes tests, and fixes some lint.

[Curtis Hovey (sinzui)]

thank you.

review: Approve (code)

=== modified file 'tests/test_update_streams.py'
--- tests/test_update_streams.py	2016-02-23 17:53:55 +0000
+++ tests/test_update_streams.py	2016-03-01 15:34:50 +0000
@@ -22,22 +22,22 @@
 class TestParseArgs(TestCase):
 
     def test_default(self):
-        parsed = parse_args(['foo', 'bar', 'baz'])
+        parsed = parse_args(['foo', 'bar', 'baz', 'qux'])
         expected = Namespace(
-            config_file='foo', s3_root='bar', dest='baz', version=None,
-            poke='0', timestamp=None)
+            config_file='foo', s3_root='bar', dest='baz',
+            simplestreams_dir='qux', version=None, poke='0', timestamp=None)
         self.assertEqual(expected, parsed)
 
     def test_version(self):
-        parsed = parse_args(['foo', 'bar', 'baz', 'qux'])
-        self.assertEqual('qux', parsed.version)
+        parsed = parse_args(['foo', 'bar', 'baz', 'qux', 'quxx'])
+        self.assertEqual('quxx', parsed.version)
 
     def test_poke(self):
-        parsed = parse_args(['foo', 'bar', 'baz', '--poke', '123'])
+        parsed = parse_args(['foo', 'bar', 'baz', 'qux', '--poke', '123'])
         self.assertEqual('123', parsed.poke)
 
     def test_timestamp(self):
-        parsed = parse_args(['foo', 'bar', 'baz', '--timestamp',
+        parsed = parse_args(['foo', 'bar', 'baz', 'qux', '--timestamp',
                              'Wed, 17 Feb 2016 20:44:59 +0000'])
         self.assertEqual('Wed, 17 Feb 2016 20:44:59 +0000', parsed.timestamp)
 
@@ -59,16 +59,17 @@
     def test_from_args(self):
         updater = Updater.from_args(Namespace(
             config_file='foo', s3_root='bar', dest='baz', version='qux',
-            poke='123'), 'temp_dir1')
+            poke='123', simplestreams_dir='quxx'), 'temp_dir1')
         self.assertEqual(updater.config_file, 'foo')
         self.assertEqual(updater.s3_root, 'bar')
         self.assertEqual(updater.dest, 'baz')
         self.assertEqual(updater.version, 'qux')
         self.assertEqual(updater.temp_dir, 'temp_dir1')
+        self.assertEqual(updater.simplestreams_dir, 'quxx')
 
     def make_updater(self, download_dir='temp_dir1', dest_dir='dest1'):
         return Updater('config1', 's3_root1', download_dir, dest_dir,
-                       'version1')
+                       'sstream_dir', 'version1')
 
     def test_s3cmd(self):
         updater = self.make_updater()
@@ -80,10 +81,16 @@
     def test_get_path_hashes(self):
         updater = self.make_updater()
         with patch('subprocess.check_output', autospec=True) as cc_mock:
-            result = updater.get_path_hashes()
+            with patch('update_streams.require_branch',
+                       autospec=True) as rb_mock:
+                result = updater.get_path_hashes()
+        env = dict(os.environ)
+        env['PYTHONPATH'] = 'sstream_dir'
+        rb_mock.assert_called_once_with('lp:simplestreams', 'sstream_dir')
         cc_mock.assert_called_once_with([
-            'sstream-query', 'temp_dir1/streams/v1/index2.json',
-            'version=version1', '--output-format=%(path)s %(sha256)s'])
+            'sstream_dir/bin/sstream-query',
+            'temp_dir1/streams/v1/index2.json', 'version=version1',
+            '--output-format=%(path)s %(sha256)s'], env=env)
         self.assertIs(cc_mock.return_value, result)
 
     def test_get_path_hashes_none_version(self):

=== modified file 'tests/test_utility.py'
--- tests/test_utility.py	2016-02-19 21:43:30 +0000
+++ tests/test_utility.py	2016-03-01 15:34:50 +0000
@@ -1,12 +1,16 @@
 import os
 from unittest import TestCase
 
-from mock import patch
+from mock import (
+    call,
+    patch,
+    )
 
 from utility import (
     acquire_log_dir,
     check_log,
     get_log_subdir,
+    require_branch,
     temp_dir,
     )
 
@@ -79,3 +83,26 @@
             with open(dest_filename) as dest_file:
                 dest_content = dest_file.read()
         self.assertEqual(tools_content, dest_content)
+
+
+class TestRequireBranch(TestCase):
+
+    def test_default(self):
+        with temp_dir() as destination:
+            with patch('subprocess.check_call') as cc_mock:
+                require_branch('lp:source', destination)
+        cc_mock.assert_called_once_with(
+            ['bzr', '--no-aliases', 'pull', '--overwrite', '-d', destination,
+             'lp:source'])
+
+    def test_subdir(self):
+        with temp_dir() as parent:
+            grandchild = os.path.join(parent, 'child', 'grandchild')
+            with patch('subprocess.check_call') as cc_mock:
+                require_branch('lp:source', grandchild)
+                self.assertTrue(os.path.isdir(grandchild))
+        self.assertEqual([
+            call(['bzr', '--no-aliases', 'init', grandchild]),
+            call(['bzr', '--no-aliases', 'pull', '--overwrite', '-d',
+                  grandchild, 'lp:source']),
+            ], cc_mock.mock_calls)

=== modified file 'update_config.py'
--- update_config.py	2016-02-24 22:11:03 +0000
+++ update_config.py	2016-03-01 15:34:50 +0000
@@ -2,6 +2,7 @@
 from argparse import ArgumentParser
 from textwrap import dedent
 
+
 def update_streams(args):
     return {
         'operation': 'update-streams',