提交 21864e28 编写于 作者: M Martin Kletzander

tests: Fix virnetsockettest after SSH command line changes

Commit e4cb8500 changed the way ssh command line is created by
adding '--' before the hostname in order to fix a potential security
flaw.  However it failed to modify the tests, so let's do that.
Signed-off-by: NMartin Kletzander <mkletzan@redhat.com>
上级 b39464ba
...@@ -491,7 +491,7 @@ mymain(void) ...@@ -491,7 +491,7 @@ mymain(void)
struct testSSHData sshData1 = { struct testSSHData sshData1 = {
.nodename = "somehost", .nodename = "somehost",
.path = "/tmp/socket", .path = "/tmp/socket",
.expectOut = "somehost sh -c 'if 'nc' -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1; then " .expectOut = "-- somehost sh -c 'if 'nc' -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1; then "
"ARG=-q0;" "ARG=-q0;"
"else " "else "
"ARG=;" "ARG=;"
...@@ -509,7 +509,7 @@ mymain(void) ...@@ -509,7 +509,7 @@ mymain(void)
.noTTY = true, .noTTY = true,
.noVerify = false, .noVerify = false,
.path = "/tmp/socket", .path = "/tmp/socket",
.expectOut = "-p 9000 -l fred -T -o BatchMode=yes -e none somehost sh -c '" .expectOut = "-p 9000 -l fred -T -o BatchMode=yes -e none -- somehost sh -c '"
"if 'netcat' -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1; then " "if 'netcat' -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1; then "
"ARG=-q0;" "ARG=-q0;"
"else " "else "
...@@ -528,7 +528,7 @@ mymain(void) ...@@ -528,7 +528,7 @@ mymain(void)
.noTTY = false, .noTTY = false,
.noVerify = true, .noVerify = true,
.path = "/tmp/socket", .path = "/tmp/socket",
.expectOut = "-p 9000 -l fred -o StrictHostKeyChecking=no somehost sh -c '" .expectOut = "-p 9000 -l fred -o StrictHostKeyChecking=no -- somehost sh -c '"
"if 'netcat' -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1; then " "if 'netcat' -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1; then "
"ARG=-q0;" "ARG=-q0;"
"else " "else "
...@@ -550,7 +550,7 @@ mymain(void) ...@@ -550,7 +550,7 @@ mymain(void)
struct testSSHData sshData5 = { struct testSSHData sshData5 = {
.nodename = "crashyhost", .nodename = "crashyhost",
.path = "/tmp/socket", .path = "/tmp/socket",
.expectOut = "crashyhost sh -c " .expectOut = "-- crashyhost sh -c "
"'if 'nc' -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1; then " "'if 'nc' -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1; then "
"ARG=-q0;" "ARG=-q0;"
"else " "else "
...@@ -567,7 +567,7 @@ mymain(void) ...@@ -567,7 +567,7 @@ mymain(void)
.path = "/tmp/socket", .path = "/tmp/socket",
.keyfile = "/root/.ssh/example_key", .keyfile = "/root/.ssh/example_key",
.noVerify = true, .noVerify = true,
.expectOut = "-i /root/.ssh/example_key -o StrictHostKeyChecking=no example.com sh -c '" .expectOut = "-i /root/.ssh/example_key -o StrictHostKeyChecking=no -- example.com sh -c '"
"if 'nc' -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1; then " "if 'nc' -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1; then "
"ARG=-q0;" "ARG=-q0;"
"else " "else "
...@@ -582,7 +582,7 @@ mymain(void) ...@@ -582,7 +582,7 @@ mymain(void)
.nodename = "somehost", .nodename = "somehost",
.netcat = "nc -4", .netcat = "nc -4",
.path = "/tmp/socket", .path = "/tmp/socket",
.expectOut = "somehost sh -c 'if ''nc -4'' -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1; then " .expectOut = "-- somehost sh -c 'if ''nc -4'' -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1; then "
"ARG=-q0;" "ARG=-q0;"
"else " "else "
"ARG=;" "ARG=;"
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册