public_git
/
kaniko
mirror of https://github.com/GoogleContainerTools/kaniko
1
0
Fork 0
Code Issues Releases Wiki Activity

fix bad merge

This commit is contained in:
Tejal Desai 2019-10-04 11:20:41 -07:00
parent f206e3f425
commit b57160198e
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkg/executor/push_test.go
View File

@ -17,14 +17,20 @@ limitations under the License.
package executor package executor
import ( import (
"bytes"
"fmt" "fmt"
"io/ioutil"
"net/http"
"os" "os"
"path/filepath" "path/filepath"
"testing" "testing"
"github.com/GoogleContainerTools/kaniko/pkg/config"
"github.com/GoogleContainerTools/kaniko/testutil"
"github.com/google/go-containerregistry/pkg/name" "github.com/google/go-containerregistry/pkg/name"
"github.com/google/go-containerregistry/pkg/v1/layout"
"github.com/google/go-containerregistry/pkg/v1/random" "github.com/google/go-containerregistry/pkg/v1/random"
"github.com/google/go-containerregistry/pkg/v1/validate"
"github.com/spf13/afero" "github.com/spf13/afero"
) )
@ -95,19 +101,7 @@ func TestWriteImageOutputs(t *testing.T) {
} }
}) })
} }
======= }
"bytes"
"io/ioutil"
"net/http"
"os"
"testing"
"github.com/GoogleContainerTools/kaniko/pkg/config"
"github.com/GoogleContainerTools/kaniko/testutil"
"github.com/google/go-containerregistry/pkg/v1/layout"
"github.com/google/go-containerregistry/pkg/v1/random"
"github.com/google/go-containerregistry/pkg/v1/validate"
)
func TestHeaderAdded(t *testing.T) { func TestHeaderAdded(t *testing.T) {
tests := []struct { tests := []struct {