mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-07-13 09:02:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

[decomposed] more cli command tests (#3087)

Browse Source 
* more cli command tests

* add tests to expected failures file
This commit is contained in:
Viktor Scharf
2026-07-09 07:51:43 +02:00
committed by GitHub
parent 415900ab01
commit 9efc71d42e
14 changed files with 364 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
tests/ocwrapper/opencloud/opencloud.go
View File

@@ -234,9 +234,14 @@ func waitUntilCompleteShutdown() (bool, string) {
return true, "OpenCloud server stopped successfully"
}
func RunCommand(command string, inputs []string) (int, string) {
const defaultCommandTimeout = 5 * time.Second
func RunCommand(command string, inputs []string, timeout time.Duration) (int, string) {
logs := new(strings.Builder)
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
if timeout <= 0 {
timeout = defaultCommandTimeout
}
ctx, cancel := context.WithTimeout(context.Background(), timeout)
defer cancel()
// build the command
@@ -254,6 +259,11 @@ func RunCommand(command string, inputs []string) (int, string) {
for _, input := range inputs {
fmt.Fprintf(ptyF, "%s\n", input)
}
copyDone := make(chan struct{})
go func() {
io.Copy(logs, ptyF)
close(copyDone)
}()
var cmdOutput string
if err := c.Wait(); err != nil {
@@ -261,9 +271,7 @@ func RunCommand(command string, inputs []string) (int, string) {
cmdOutput = "Command timed out:\n"
}
}
// Copy the logs from the pty
io.Copy(logs, ptyF)
<-copyDone
cmdOutput += logs.String()
// TODO: find if there is a better way to remove stdins from the output
@@ -272,9 +280,12 @@ func RunCommand(command string, inputs []string) (int, string) {
return c.ProcessState.ExitCode(), cmdOutput
}
func RunRawCommand(command string, inputs []string) (int, string) {
func RunRawCommand(command string, inputs []string, timeout time.Duration) (int, string) {
logs := new(strings.Builder)
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
if timeout <= 0 {
timeout = defaultCommandTimeout
}
ctx, cancel := context.WithTimeout(context.Background(), timeout)
defer cancel()
fmt.Print("Running command: ", command)
@@ -290,6 +301,11 @@ func RunRawCommand(command string, inputs []string) (int, string) {
for _, input := range inputs {
fmt.Fprintf(ptyF, "%s\n", input)
}
copyDone := make(chan struct{})
go func() {
io.Copy(logs, ptyF)
close(copyDone)
}()
var cmdOutput string
if err := c.Wait(); err != nil {
@@ -297,8 +313,7 @@ func RunRawCommand(command string, inputs []string) (int, string) {
cmdOutput = "Command timed out:\n"
}
}
io.Copy(logs, ptyF)
<-copyDone
cmdOutput += logs.String()
cmdOutput = strings.TrimLeft(cmdOutput, strings.Join(inputs, "\r\n"))

10
tests/ocwrapper/wrapper/handlers/handler.go
View File

@@ -9,6 +9,7 @@ import (
"ocwrapper/common"
"ocwrapper/opencloud"
"os"
"time"
)
type BasicResponse struct {
@@ -203,14 +204,19 @@ func CommandHandler(res http.ResponseWriter, req *http.Request) {
raw = r
}
var timeout time.Duration
if t, ok := body["timeout"].(float64); ok {
timeout = time.Duration(t) * time.Second
}
var exitCode int
var output string
if raw {
exitCode, output = opencloud.RunRawCommand(command, stdIn)
exitCode, output = opencloud.RunRawCommand(command, stdIn, timeout)
} else {
exitCode, output = opencloud.RunCommand(command, stdIn)
exitCode, output = opencloud.RunCommand(command, stdIn, timeout)
}
sendCmdResponse(res, exitCode, output)
}