← Back to branch summary

~openstack-charmers-next/charms/xenial/swift-storage/trunk

« back to all changes in this revision

Viewing changes to unit_tests/test_swift_storage_utils.py

  • Committer: James Page
  • Date: 2016-03-03 11:50:13 UTC
  • Revision ID: james.page@ubuntu.com-20160303115013-h6ebo078dpdaf5fp
Resync charm-helpers

Resolve single unit deployment failure with default configuration;
update unit tests to ensure that mkdir is called for /srv/node.

Change-Id: Id5518a2144ec3bdc6341f6dfc85835ae342f490e

Show diffs side-by-side

added added

removed removed

Lines of Context:
unit_tests/test_swift_storage_utils.py
216
216
        calls = [call(['chown', '-R', 'swift:swift', '/srv/node/']),
217
217
                 call(['chmod', '-R', '0755', '/srv/node/'])]
218
218
        self.check_call.assert_has_calls(calls)
 
219
        self.mkdir.assert_has_calls([
 
220
            call('/srv/node', owner='swift', group='swift',
 
221
                 perms=0o755),
 
222
            call('/srv/node/vdb', group='swift', owner='swift')
 
223
        ])
219
224
 
220
225
    @patch.object(swift_utils, 'clean_storage')
221
226
    @patch.object(swift_utils, 'mkfs_xfs')
226
231
        self.test_config.set('overwrite', 'True')
227
232
        swift_utils.setup_storage()
228
233
        clean.assert_called_with('/dev/vdb')
229
 
        self.mkdir.assert_called_with('/srv/node/vdb', owner='swift',
230
 
                                      group='swift')
231
234
        self.mount.assert_called_with('/dev/vdb', '/srv/node/vdb',
232
235
                                      filesystem='xfs')
233
236
        self.fstab_add.assert_called_with('/dev/vdb', '/srv/node/vdb',
236
239
        calls = [call(['chown', '-R', 'swift:swift', '/srv/node/']),
237
240
                 call(['chmod', '-R', '0755', '/srv/node/'])]
238
241
        self.check_call.assert_has_calls(calls)
 
242
        self.mkdir.assert_has_calls([
 
243
            call('/srv/node', owner='swift', group='swift',
 
244
                 perms=0o755),
 
245
            call('/srv/node/vdb', group='swift', owner='swift')
 
246
        ])
239
247
 
240
248
    def _fake_is_device_mounted(self, device):
241
249
        if device in ["/dev/sda", "/dev/vda", "/dev/cciss/c0d0"]:
368
376
            'xfs',
369
377
            options='loop, defaults'
370
378
        )
 
379
        self.mkdir.assert_has_calls([
 
380
            call('/srv/node', owner='swift', group='swift',
 
381
                 perms=0o755),
 
382
            call('/srv/node/test.img', group='swift', owner='swift')
 
383
        ])
 
384