]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
tests: fix regression in qa/tasks/ceph_master.py 13239/head
authorNathan Cutler <ncutler@suse.com>
Mon, 6 Feb 2017 17:43:49 +0000 (18:43 +0100)
committerNathan Cutler <ncutler@suse.com>
Tue, 7 Feb 2017 12:38:37 +0000 (13:38 +0100)
commitc968ed34b100baeb3a6a3245ad39c2a2d6fab04e
tree25224a615c98a0bc8d984ae5e25b4c2453805fd5
parent9620088542f80efb97960b4d9d51876ff1784aa9
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>
(cherry picked from commit db2582e25e390fcaf75952eb59a73dcff643f49c)
qa/tasks/ceph_manager.py