From: Dan Mick Date: Tue, 25 Apr 2017 06:36:38 +0000 (-0700) Subject: test/cli/ceph-conf/env-vs-args.t: accept new error messages X-Git-Tag: v12.0.3~245^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1fc50db592822c07a9b978093960c20287a256ce;p=ceph.git test/cli/ceph-conf/env-vs-args.t: accept new error messages Failing to load ceph.conf now dumps more errors for the user Signed-off-by: Dan Mick --- diff --git a/src/test/cli/ceph-conf/env-vs-args.t b/src/test/cli/ceph-conf/env-vs-args.t index 76b2dec9cfb8..d14c483d3763 100644 --- a/src/test/cli/ceph-conf/env-vs-args.t +++ b/src/test/cli/ceph-conf/env-vs-args.t @@ -1,6 +1,10 @@ # we can use CEPH_CONF to override the normal configuration file location. $ env CEPH_CONF=from-env ceph-conf -s foo bar .* \-1 did not load config file, using default settings. (re) + .* \-1 Errors while parsing config file! (re) + .* \-1 parse_file: cannot open from-env: \(2\) No such file or directory (re) + .* \-1 Errors while parsing config file! (re) + .* \-1 parse_file: cannot open from-env: \(2\) No such file or directory (re) [1] # command-line arguments should override environment