]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
tests: fix regression in qa/tasks/ceph_master.py 13279/head
authorNathan Cutler <ncutler@suse.com>
Mon, 6 Feb 2017 17:43:49 +0000 (18:43 +0100)
committerNathan Cutler <ncutler@suse.com>
Mon, 6 Feb 2017 18:37:38 +0000 (19:37 +0100)
commitdb2582e25e390fcaf75952eb59a73dcff643f49c
tree4d599f747b48928eb9488e5d7a04425ea6bb4935
parentfc2df15c015fff0535385728183d27b6d38714fd
tests: fix regression in qa/tasks/ceph_master.py

https://github.com/ceph/ceph/pull/13194 introduced a regression:

2017-02-06T16:14:23.162 INFO:tasks.thrashosds.thrasher:Traceback (most recent call last):
  File "/home/teuthworker/src/github.com_ceph_ceph_master/qa/tasks/ceph_manager.py", line 722, in wrapper
    return func(self)
  File "/home/teuthworker/src/github.com_ceph_ceph_master/qa/tasks/ceph_manager.py", line 839, in do_thrash
    self.choose_action()()
  File "/home/teuthworker/src/github.com_ceph_ceph_master/qa/tasks/ceph_manager.py", line 305, in kill_osd
    output = proc.stderr.getvalue()
AttributeError: 'NoneType' object has no attribute 'getvalue'

This is because the original patch failed to pass "stderr=StringIO()" to run().

Fixes: http://tracker.ceph.com/issues/16263
Signed-off-by: Nathan Cutler <ncutler@suse.com>
Signed-off-by: Kefu Chai <kchai@redhat.com>
qa/tasks/ceph_manager.py