← Back to branch summary

~niedbalski/charms/trusty/swift-storage/fix-lp-1308557

« back to all changes in this revision

Viewing changes to unit_tests/test_swift_storage_utils.py

  • Committer: James Page
  • Date: 2014-04-16 08:34:53 UTC
  • mfrom: (24.1.17 swift-storage)
  • Revision ID: james.page@canonical.com-20140416083453-3n4gz51lk3p8tojd
[james-page,r=james-page,t=*]

Support for Icehouse on 12.04 and 14.04

Show diffs side-by-side

added added

removed removed

Lines of Context:
unit_tests/test_swift_storage_utils.py
6
6
 
7
7
TO_PATCH = [
8
8
    'apt_update',
9
 
    'apt_install',
 
9
    'apt_upgrade',
10
10
    'log',
11
11
    'config',
12
12
    'configure_installation_source',
215
215
            '--option', 'Dpkg::Options::=--force-confdef',
216
216
        ]
217
217
        self.assertTrue(self.apt_update.called)
218
 
        self.apt_install.assert_called_with(
219
 
            packages=swift_utils.PACKAGES,
 
218
        self.apt_upgrade.assert_called_with(
220
219
            options=dpkg_opts,
221
 
            fatal=True
 
220
            fatal=True, dist=True
222
221
        )
223
222
        services = (swift_utils.ACCOUNT_SVCS + swift_utils.CONTAINER_SVCS +
224
223
                    swift_utils.OBJECT_SVCS)