Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ceph.in: improve the interactive mode
* if ceph is not reading from a tty, expect EOF instead of "quit" as the end of input. * do not panic at seeing the EOF * update the test case test_mon_injectargs_SI(). since we disables "ceph injectargs <args,...>" in a458bd8, in which the arguments of "injectargs" are supposed to be consumed by "tell" instead. so "ceph injectargs ..." is taken as an incomplete command, and this command will bring ceph cli into the interactive mode, redirecting its stdin to /dev/null helps ceph cli quit the loop, but in a way of throwing EOFError exception. this change handles the EOF, so the "ceph injectargs ..." does not throws anymore. but the side effect is that the test fails since it expects a non-zero return code. so replace it with an equivalent "tell" command which also fails but due to the non-SI postfix. Signed-off-by: Kefu Chai <kchai@redhat.com> (cherry picked from commit da9d2b4)
- Loading branch information
Showing
2 changed files
with
28 additions
and
14 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters