Merge lp:~gnuoy/charm-helpers/add-apt-hold into lp:charm-helpers

[Liam Young]

Added ability to hold packages and tidied up some old lint from the fetch tests

[James Page (james-page)]

review: Approve

=== modified file 'charmhelpers/fetch/__init__.py'
--- charmhelpers/fetch/__init__.py	2013-08-21 11:45:37 +0000
+++ charmhelpers/fetch/__init__.py	2013-09-02 08:47:58 +0000
@@ -79,6 +79,20 @@
         subprocess.call(cmd)
 
 
+def apt_hold(packages, fatal=False):
+    """Hold one or more packages"""
+    cmd = ['apt-mark', 'hold']
+    if isinstance(packages, basestring):
+        cmd.append(packages)
+    else:
+        cmd.extend(packages)
+    log("Holding {}".format(packages))
+    if fatal:
+        subprocess.check_call(cmd)
+    else:
+        subprocess.call(cmd)
+
+
 def add_source(source, key=None):
     if ((source.startswith('ppa:') or
          source.startswith('http:'))):
 
=== modified file 'tests/fetch/test_fetch.py'
--- tests/fetch/test_fetch.py	2013-08-21 15:45:53 +0000
+++ tests/fetch/test_fetch.py	2013-09-02 08:47:58 +0000
@@ -352,27 +352,24 @@
         check_call.assert_called_with(['apt-get', '-y', '--foo', '--bar',
                                        'install', 'foo', 'bar'])
 
-
     @patch('subprocess.check_call')
     @patch.object(fetch, 'log')
     def test_purges_apt_packages_as_string_fatal(self, log, mock_call):
         packages = 'irrelevant names'
         mock_call.side_effect = OSError('fail')
 
-        mock_call.assertRaises(OSError, fetch.apt_purge, packages, fatal=True )
+        mock_call.assertRaises(OSError, fetch.apt_purge, packages, fatal=True)
         log.assert_called()
 
-
     @patch('subprocess.check_call')
     @patch.object(fetch, 'log')
     def test_purges_apt_packages_fatal(self, log, mock_call):
         packages = ['irrelevant', 'names']
         mock_call.side_effect = OSError('fail')
 
-        mock_call.assertRaises(OSError, fetch.apt_purge, packages, fatal=True )
+        mock_call.assertRaises(OSError, fetch.apt_purge, packages, fatal=True)
         log.assert_called()
 
-
     @patch('subprocess.call')
     @patch.object(fetch, 'log')
     def test_purges_apt_packages_as_string_nofatal(self, log, mock_call):
@@ -383,7 +380,6 @@
         log.assert_called()
         mock_call.assert_called_with(['apt-get', '-y', 'purge', 'foo bar'])
 
-
     @patch('subprocess.call')
     @patch.object(fetch, 'log')
     def test_purges_apt_packages_nofatal(self, log, mock_call):
@@ -395,6 +391,53 @@
         mock_call.assert_called_with(['apt-get', '-y', 'purge', 'foo',
                                       'bar'])
 
+    @patch('subprocess.check_call')
+    @patch.object(fetch, 'log')
+    def test_hold_apt_packages_as_string_fatal(self, log, mock_call):
+        packages = 'irrelevant names'
+        mock_call.side_effect = OSError('fail')
+
+        mock_call.assertRaises(OSError, fetch.apt_hold, packages, fatal=True)
+        log.assert_called()
+
+    @patch('subprocess.check_call')
+    @patch.object(fetch, 'log')
+    def test_hold_apt_packages_fatal(self, log, mock_call):
+        packages = ['irrelevant', 'names']
+        mock_call.side_effect = OSError('fail')
+
+        mock_call.assertRaises(OSError, fetch.apt_hold, packages, fatal=True)
+        log.assert_called()
+
+    @patch('subprocess.call')
+    @patch.object(fetch, 'log')
+    def test_hold_apt_packages_as_string_nofatal(self, log, mock_call):
+        packages = 'foo bar'
+
+        fetch.apt_hold(packages)
+
+        log.assert_called()
+        mock_call.assert_called_with(['apt-mark', 'hold', 'foo bar'])
+
+    @patch('subprocess.call')
+    @patch.object(fetch, 'log')
+    def test_hold_apt_packages_nofatal(self, log, mock_call):
+        packages = ['foo', 'bar']
+
+        fetch.apt_hold(packages)
+
+        log.assert_called()
+        mock_call.assert_called_with(['apt-mark', 'hold', 'foo', 'bar'])
+
+    @patch('subprocess.call')
+    @patch.object(fetch, 'log')
+    def test_hold_apt_packages_nofatal_abortonfatal(self, log, mock_call):
+        packages = ['foo', 'bar']
+
+        fetch.apt_hold(packages, fatal=True)
+
+        log.assert_called()
+        mock_call.assert_called_with(['apt-mark', 'hold', 'foo', 'bar'])
 
     @patch('subprocess.check_call')
     def test_apt_update_fatal(self, check_call):