NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

virnetsockettest: Improve indentation

Browse Source 
Having the actual script indented and the closing quote on a
separate line, like

  sh -c '
    if foo; then
      bar;
    fi
  '

makes things more readable and easier to scan visually.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Andrea Bolognani 2022-02-09 19:54:34 +01:00
parent a280b9282f
commit 709d190a82
1 changed files with 42 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
tests/virnetsockettest.c
View File

@ -570,12 +570,13 @@ mymain(void)
.path = "/tmp/socket", .path = "/tmp/socket",
.netcat = "nc", .netcat = "nc",
.expectOut = "-T -e none -- somehost sh -c '" .expectOut = "-T -e none -- somehost 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 "
"ARG=;" "ARG=;"
"fi;" "fi;"
"'nc' $ARG -U /tmp/socket'\n", "'nc' $ARG -U /tmp/socket"
"'\n",
}; };
if (virTestRun("SSH test 1", testSocketSSH, &sshData1) < 0) if (virTestRun("SSH test 1", testSocketSSH, &sshData1) < 0)
ret = -1; ret = -1;
@ -589,12 +590,13 @@ mymain(void)
.noVerify = false, .noVerify = false,
.path = "/tmp/socket", .path = "/tmp/socket",
.expectOut = "-p 9000 -l fred -T -e none -o BatchMode=yes -- somehost sh -c '" .expectOut = "-p 9000 -l fred -T -e none -o BatchMode=yes -- 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 "
"ARG=;" "ARG=;"
"fi;" "fi;"
"'netcat' $ARG -U /tmp/socket'\n", "'netcat' $ARG -U /tmp/socket"
"'\n",
}; };
if (virTestRun("SSH test 2", testSocketSSH, &sshData2) < 0) if (virTestRun("SSH test 2", testSocketSSH, &sshData2) < 0)
ret = -1; ret = -1;
@ -608,12 +610,13 @@ mymain(void)
.noVerify = true, .noVerify = true,
.path = "/tmp/socket", .path = "/tmp/socket",
.expectOut = "-p 9000 -l fred -T -e none -o StrictHostKeyChecking=no -- somehost sh -c '" .expectOut = "-p 9000 -l fred -T -e none -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 "
"ARG=;" "ARG=;"
"fi;" "fi;"
"'netcat' $ARG -U /tmp/socket'\n", "'netcat' $ARG -U /tmp/socket"
"'\n",
}; };
if (virTestRun("SSH test 3", testSocketSSH, &sshData3) < 0) if (virTestRun("SSH test 3", testSocketSSH, &sshData3) < 0)
ret = -1; ret = -1;
@ -631,12 +634,13 @@ mymain(void)
.path = "/tmp/socket", .path = "/tmp/socket",
.netcat = "nc", .netcat = "nc",
.expectOut = "-T -e none -- crashyhost sh -c '" .expectOut = "-T -e none -- 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 "
"ARG=;" "ARG=;"
"fi;" "fi;"
"'nc' $ARG -U /tmp/socket'\n", "'nc' $ARG -U /tmp/socket"
"'\n",
.dieEarly = true, .dieEarly = true,
}; };
if (virTestRun("SSH test 5", testSocketSSH, &sshData5) < 0) if (virTestRun("SSH test 5", testSocketSSH, &sshData5) < 0)
@ -649,12 +653,13 @@ mymain(void)
.keyfile = "/root/.ssh/example_key", .keyfile = "/root/.ssh/example_key",
.noVerify = true, .noVerify = true,
.expectOut = "-i /root/.ssh/example_key -T -e none -o StrictHostKeyChecking=no -- example.com sh -c '" .expectOut = "-i /root/.ssh/example_key -T -e none -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 "
"ARG=;" "ARG=;"
"fi;" "fi;"
"'nc' $ARG -U /tmp/socket'\n", "'nc' $ARG -U /tmp/socket"
"'\n",
}; };
if (virTestRun("SSH test 6", testSocketSSH, &sshData6) < 0) if (virTestRun("SSH test 6", testSocketSSH, &sshData6) < 0)
ret = -1; ret = -1;
@ -664,12 +669,13 @@ mymain(void)
.netcat = "/tmp/fo o/nc", .netcat = "/tmp/fo o/nc",
.path = "/tmp/socket", .path = "/tmp/socket",
.expectOut = "-T -e none -- somehost sh -c '" .expectOut = "-T -e none -- somehost sh -c '"
"if '''\\''/tmp/fo o/nc'\\'''' -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1; then " "if '''\\''/tmp/fo o/nc'\\'''' -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1; then "
"ARG=-q0;" "ARG=-q0;"
"else " "else "
"ARG=;" "ARG=;"
"fi;" "fi;"
"'''\\''/tmp/fo o/nc'\\'''' $ARG -U /tmp/socket'\n", "'''\\''/tmp/fo o/nc'\\'''' $ARG -U /tmp/socket"
"'\n",
}; };
VIR_WARNINGS_RESET VIR_WARNINGS_RESET
if (virTestRun("SSH test 7", testSocketSSH, &sshData7) < 0) if (virTestRun("SSH test 7", testSocketSSH, &sshData7) < 0)