ensure stderr can be used in err checks

Signed-off-by: Kristoffer Dalby <[email protected]>
kradalby · Aug 30, 2024 · cb12055 · cb12055
1 parent 4bd6936
commit cb12055
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/integration/dockertestutil/execute.go b/integration/dockertestutil/execute.go
@@ -62,7 +62,7 @@ func ExecuteCommand(
  exitCode, err := resource.Exec(
  cmd,
  dockertest.ExecOptions{
- Env: append(env, "HEADSCALE_LOG_LEVEL=disabled"),
+ Env: append(env, "HEADSCALE_LOG_LEVEL=info"),
  StdOut: &stdout,
  StdErr: &stderr,
  },

diff --git a/integration/hsic/hsic.go b/integration/hsic/hsic.go
@@ -551,7 +551,7 @@ func (t *HeadscaleInContainer) Execute(
  log.Printf("command stdout: %s\n", stdout)
  }
 
- return "", err
+ return stdout, fmt.Errorf("executing command in docker: %w, stderr: %s", err, stderr)
  }
 
  return stdout, nil