mirror of
https://github.com/GoogleContainerTools/kaniko
synced 2026-10-04 10:42:28 +02:00
Priya Wadhwa
6c39f29081
When running container-diff in integration tests, both stdout and stderr were being returned and unmarshalled into the container-diff json object. If container-diff was giving any error messages (such as, if it didn't have permissions to extract a file), this would fail even if ultimately no differences between the filesystems existed. I updated the RunCommands to only return stdout and print stderr if the command fails.
56 lines
1.5 KiB
Go
56 lines
1.5 KiB
Go
/*
|
|
Copyright 2018 Google LLC
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package integration
|
|
|
|
import (
|
|
"bytes"
|
|
"fmt"
|
|
"os/exec"
|
|
"testing"
|
|
)
|
|
|
|
// RunCommandWithoutTest will run cmd and if it fails will output relevant info
|
|
// for debugging before returning an error. It can be run outside the context of a test.
|
|
func RunCommandWithoutTest(cmd *exec.Cmd) ([]byte, error) {
|
|
var stderr bytes.Buffer
|
|
cmd.Stderr = &stderr
|
|
output, err := cmd.Output()
|
|
if err != nil {
|
|
fmt.Println(cmd.Args)
|
|
fmt.Println(stderr.String())
|
|
fmt.Println(string(output))
|
|
}
|
|
return output, err
|
|
}
|
|
|
|
// RunCommand will run cmd and if it fails will output relevant info for debugging
|
|
// before it fails. It must be run within the context of a test t and if the command
|
|
// fails, it will the test. Returns the output from the command.
|
|
func RunCommand(cmd *exec.Cmd, t *testing.T) []byte {
|
|
var stderr bytes.Buffer
|
|
cmd.Stderr = &stderr
|
|
output, err := cmd.Output()
|
|
if err != nil {
|
|
t.Log(cmd.Args)
|
|
t.Log(stderr.String())
|
|
t.Log(string(output))
|
|
t.Error(err)
|
|
t.FailNow()
|
|
}
|
|
return output
|
|
}
|