diff options
| author |   Guido Günther <agx@sigxcpu.org> | 2011-10-13 21:49:01 +0200 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2011-10-13 23:41:32 +0200 |
| commit | 6ac6238de33fc74e7545b245ae273d1bfd658808 (patch) | |
| tree | e747e3b10fb110638d127d6a0031035ae5ea8fc8 /tests/virnetsockettest.c | |
| parent | Add virBufferEscapeShell (diff) | |
| download | libvirt-6ac6238de33fc74e7545b245ae273d1bfd658808.tar.gz libvirt-6ac6238de33fc74e7545b245ae273d1bfd658808.tar.bz2 libvirt-6ac6238de33fc74e7545b245ae273d1bfd658808.zip | |
Use virBufferEscapeShell in virNetSocketNewConnectSSH
to escape the netcat command since it's passed to the shell. Adjust
expected test case output accordingly.
Diffstat (limited to 'tests/virnetsockettest.c')
| -rw-r--r-- | tests/virnetsockettest.c | 34 |
1 files changed, 24 insertions, 10 deletions
diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c index 75cc9c02c..6320ce04a 100644 --- a/tests/virnetsockettest.c +++ b/tests/virnetsockettest.c @@ -496,12 +496,12 @@ mymain(void) struct testSSHData sshData1 = { .nodename = "somehost", .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;" "else " "ARG=;" "fi;" - "nc $ARG -U /tmp/socket'\n", + "'nc' $ARG -U /tmp/socket'\n", }; if (virtTestRun("SSH test 1", 1, testSocketSSH, &sshData1) < 0) ret = -1; @@ -515,12 +515,12 @@ mymain(void) .noVerify = false, .path = "/tmp/socket", .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;" "else " "ARG=;" "fi;" - "netcat $ARG -U /tmp/socket'\n", + "'netcat' $ARG -U /tmp/socket'\n", }; if (virtTestRun("SSH test 2", 1, testSocketSSH, &sshData2) < 0) ret = -1; @@ -534,12 +534,12 @@ mymain(void) .noVerify = true, .path = "/tmp/socket", .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;" "else " "ARG=;" "fi;" - "netcat $ARG -U /tmp/socket'\n", + "'netcat' $ARG -U /tmp/socket'\n", }; if (virtTestRun("SSH test 3", 1, testSocketSSH, &sshData3) < 0) ret = -1; @@ -556,12 +556,12 @@ mymain(void) .nodename = "crashyhost", .path = "/tmp/socket", .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;" "else " "ARG=;" "fi;" - "nc $ARG -U /tmp/socket'\n", + "'nc' $ARG -U /tmp/socket'\n", .dieEarly = true, }; if (virtTestRun("SSH test 5", 1, testSocketSSH, &sshData5) < 0) @@ -573,16 +573,30 @@ mymain(void) .keyfile = "/root/.ssh/example_key", .noVerify = true, .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;" "else " "ARG=;" "fi;" - "nc $ARG -U /tmp/socket'\n", + "'nc' $ARG -U /tmp/socket'\n", }; if (virtTestRun("SSH test 6", 1, testSocketSSH, &sshData6) < 0) ret = -1; + struct testSSHData sshData7 = { + .nodename = "somehost", + .netcat = "nc -4", + .path = "/tmp/socket", + .expectOut = "somehost sh -c 'if ''nc -4'' -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1; then " + "ARG=-q0;" + "else " + "ARG=;" + "fi;" + "''nc -4'' $ARG -U /tmp/socket'\n", + }; + if (virtTestRun("SSH test 7", 1, testSocketSSH, &sshData7) < 0) + ret = -1; + #endif return (ret==0 ? EXIT_SUCCESS : EXIT_FAILURE); |