View
583 pkg/controller/controller_test.go

Large diffs are not rendered by default.

Oops, something went wrong.
View
439 pkg/controller/util_test.go

Large diffs are not rendered by default.

Oops, something went wrong.
View
74 pkg/image/qemu_test.go
@@ -0,0 +1,74 @@
package image
import (
"io"
"reflect"
"testing"
)
func TestGetMagicNumber(t *testing.T) {
type args struct {
f io.Reader
}
tests := []struct {
name string
args args
want []byte
wantErr bool
}{
// TODO: Add test cases.
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
got, err := GetMagicNumber(tt.args.f)
if (err != nil) != tt.wantErr {
t.Errorf("GetMagicNumber() error = %v, wantErr %v", err, tt.wantErr)
return
}
if !reflect.DeepEqual(got, tt.want) {
t.Errorf("GetMagicNumber() = %v, want %v", got, tt.want)
}
})
}
}
func TestMatchQcow2MagicNum(t *testing.T) {
type args struct {
match []byte
}
tests := []struct {
name string
args args
want bool
}{
// TODO: Add test cases.
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
if got := MatchQcow2MagicNum(tt.args.match); got != tt.want {
t.Errorf("MatchQcow2MagicNum() = %v, want %v", got, tt.want)
}
})
}
}
func TestConvertQcow2ToRaw(t *testing.T) {
type args struct {
src string
dest string
}
tests := []struct {
name string
args args
wantErr bool
}{
// TODO: Add test cases.
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
if err := ConvertQcow2ToRaw(tt.args.src, tt.args.dest); (err != nil) != tt.wantErr {
t.Errorf("ConvertQcow2ToRaw() error = %v, wantErr %v", err, tt.wantErr)
}
})
}
}
View
124 pkg/image/validate_test.go
@@ -0,0 +1,124 @@
package image
import "testing"
func TestIsSupportedType(t *testing.T) {
type args struct {
fn string
exts []string
}
tests := []struct {
name string
args args
want bool
}{
// TODO: Add test cases.
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
if got := IsSupportedType(tt.args.fn, tt.args.exts); got != tt.want {
t.Errorf("IsSupportedType() = %v, want %v", got, tt.want)
}
})
}
}
func TestIsSupporedFileType(t *testing.T) {
type args struct {
fn string
}
tests := []struct {
name string
args args
want bool
}{
// TODO: Add test cases.
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
if got := IsSupporedFileType(tt.args.fn); got != tt.want {
t.Errorf("IsSupporedFileType() = %v, want %v", got, tt.want)
}
})
}
}
func TestIsSupporedCompressionType(t *testing.T) {
type args struct {
fn string
}
tests := []struct {
name string
args args
want bool
}{
// TODO: Add test cases.
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
if got := IsSupporedCompressionType(tt.args.fn); got != tt.want {
t.Errorf("IsSupporedCompressionType() = %v, want %v", got, tt.want)
}
})
}
}
func TestIsSupporedArchiveType(t *testing.T) {
type args struct {
fn string
}
tests := []struct {
name string
args args
want bool
}{
// TODO: Add test cases.
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
if got := IsSupporedArchiveType(tt.args.fn); got != tt.want {
t.Errorf("IsSupporedArchiveType() = %v, want %v", got, tt.want)
}
})
}
}
func TestIsSupporedCompressArchiveType(t *testing.T) {
type args struct {
fn string
}
tests := []struct {
name string
args args
want bool
}{
// TODO: Add test cases.
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
if got := IsSupporedCompressArchiveType(tt.args.fn); got != tt.want {
t.Errorf("IsSupporedCompressArchiveType() = %v, want %v", got, tt.want)
}
})
}
}
func TestTrimString(t *testing.T) {
type args struct {
s string
}
tests := []struct {
name string
args args
want string
}{
// TODO: Add test cases.
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
if got := TrimString(tt.args.s); got != tt.want {
t.Errorf("TrimString() = %v, want %v", got, tt.want)
}
})
}
}
View
350 pkg/importer/dataStream_test.go
@@ -0,0 +1,350 @@
package importer
import (
"io"
"net/url"
"reflect"
"testing"
)
// comment
// comment
func Test_dataStream_Read(t *testing.T) {
type fields struct {
DataRdr io.ReadCloser
url *url.URL
accessKeyId string
secretKey string
}
type args struct {
p []byte
}
tests := []struct {
name string
fields fields
args args
want int
wantErr bool
}{
// TODO: Add test cases.
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
d := &dataStream{
DataRdr: tt.fields.DataRdr,
url: tt.fields.url,
accessKeyId: tt.fields.accessKeyId,
secretKey: tt.fields.secretKey,
}
got, err := d.Read(tt.args.p)
if (err != nil) != tt.wantErr {
t.Errorf("dataStream.Read() error = %v, wantErr %v", err, tt.wantErr)
return
}
if got != tt.want {
t.Errorf("dataStream.Read() = %v, want %v", got, tt.want)
}
})
}
}
func Test_dataStream_Close(t *testing.T) {
type fields struct {
DataRdr io.ReadCloser
url *url.URL
accessKeyId string
secretKey string
}
tests := []struct {
name string
fields fields
wantErr bool
}{
// TODO: Add test cases.
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
d := &dataStream{
DataRdr: tt.fields.DataRdr,
url: tt.fields.url,
accessKeyId: tt.fields.accessKeyId,
secretKey: tt.fields.secretKey,
}
if err := d.Close(); (err != nil) != tt.wantErr {
t.Errorf("dataStream.Close() error = %v, wantErr %v", err, tt.wantErr)
}
})
}
}
func TestNewDataStream(t *testing.T) {
type args struct {
ep *url.URL
accKey string
secKey string
}
tests := []struct {
name string
args args
want *dataStream
}{
// TODO: Add test cases.
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
if got := NewDataStream(tt.args.ep, tt.args.accKey, tt.args.secKey); !reflect.DeepEqual(got, tt.want) {
t.Errorf("NewDataStream() = %v, want %v", got, tt.want)
}
})
}
}
func Test_dataStream_dataStreamSelector(t *testing.T) {
type fields struct {
DataRdr io.ReadCloser
url *url.URL
accessKeyId string
secretKey string
}
tests := []struct {
name string
fields fields
want io.ReadCloser
wantErr bool
}{
// TODO: Add test cases.
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
d := &dataStream{
DataRdr: tt.fields.DataRdr,
url: tt.fields.url,
accessKeyId: tt.fields.accessKeyId,
secretKey: tt.fields.secretKey,
}
got, err := d.dataStreamSelector()
if (err != nil) != tt.wantErr {
t.Errorf("dataStream.dataStreamSelector() error = %v, wantErr %v", err, tt.wantErr)
return
}
if !reflect.DeepEqual(got, tt.want) {
t.Errorf("dataStream.dataStreamSelector() = %v, want %v", got, tt.want)
}
})
}
}
func Test_dataStream_s3(t *testing.T) {
type fields struct {
DataRdr io.ReadCloser
url *url.URL
accessKeyId string
secretKey string
}
tests := []struct {
name string
fields fields
want io.ReadCloser
wantErr bool
}{
// TODO: Add test cases.
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
d := &dataStream{
DataRdr: tt.fields.DataRdr,
url: tt.fields.url,
accessKeyId: tt.fields.accessKeyId,
secretKey: tt.fields.secretKey,
}
got, err := d.s3()
if (err != nil) != tt.wantErr {
t.Errorf("dataStream.s3() error = %v, wantErr %v", err, tt.wantErr)
return
}
if !reflect.DeepEqual(got, tt.want) {
t.Errorf("dataStream.s3() = %v, want %v", got, tt.want)
}
})
}
}
func Test_dataStream_http(t *testing.T) {
type fields struct {
DataRdr io.ReadCloser
url *url.URL
accessKeyId string
secretKey string
}
tests := []struct {
name string
fields fields
want io.ReadCloser
wantErr bool
}{
// TODO: Add test cases.
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
d := &dataStream{
DataRdr: tt.fields.DataRdr,
url: tt.fields.url,
accessKeyId: tt.fields.accessKeyId,
secretKey: tt.fields.secretKey,
}
got, err := d.http()
if (err != nil) != tt.wantErr {
t.Errorf("dataStream.http() error = %v, wantErr %v", err, tt.wantErr)
return
}
if !reflect.DeepEqual(got, tt.want) {
t.Errorf("dataStream.http() = %v, want %v", got, tt.want)
}
})
}
}
func Test_dataStream_local(t *testing.T) {
type fields struct {
DataRdr io.ReadCloser
url *url.URL
accessKeyId string
secretKey string
}
tests := []struct {
name string
fields fields
want io.ReadCloser
wantErr bool
}{
// TODO: Add test cases.
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
d := &dataStream{
DataRdr: tt.fields.DataRdr,
url: tt.fields.url,
accessKeyId: tt.fields.accessKeyId,
secretKey: tt.fields.secretKey,
}
got, err := d.local()
if (err != nil) != tt.wantErr {
t.Errorf("dataStream.local() error = %v, wantErr %v", err, tt.wantErr)
return
}
if !reflect.DeepEqual(got, tt.want) {
t.Errorf("dataStream.local() = %v, want %v", got, tt.want)
}
})
}
}
func Test_dataStream_Copy(t *testing.T) {
type fields struct {
DataRdr io.ReadCloser
url *url.URL
accessKeyId string
secretKey string
}
type args struct {
outPath string
}
tests := []struct {
name string
fields fields
args args
wantErr bool
}{
// TODO: Add test cases.
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
d := &dataStream{
DataRdr: tt.fields.DataRdr,
url: tt.fields.url,
accessKeyId: tt.fields.accessKeyId,
secretKey: tt.fields.secretKey,
}
if err := d.Copy(tt.args.outPath); (err != nil) != tt.wantErr {
t.Errorf("dataStream.Copy() error = %v, wantErr %v", err, tt.wantErr)
}
})
}
}
func Test_copyImage(t *testing.T) {
type args struct {
r io.Reader
out string
qemu bool
}
tests := []struct {
name string
args args
wantErr bool
}{
// TODO: Add test cases.
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
if err := copyImage(tt.args.r, tt.args.out, tt.args.qemu); (err != nil) != tt.wantErr {
t.Errorf("copyImage() error = %v, wantErr %v", err, tt.wantErr)
}
})
}
}
func Test_randTmpName(t *testing.T) {
type args struct {
src string
}
tests := []struct {
name string
args args
want string
}{
// TODO: Add test cases.
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
if got := randTmpName(tt.args.src); got != tt.want {
t.Errorf("randTmpName() = %v, want %v", got, tt.want)
}
})
}
}
func Test_dataStream_parseDataPath(t *testing.T) {
type fields struct {
DataRdr io.ReadCloser
url *url.URL
accessKeyId string
secretKey string
}
tests := []struct {
name string
fields fields
want string
want1 string
}{
// TODO: Add test cases.
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
d := &dataStream{
DataRdr: tt.fields.DataRdr,
url: tt.fields.url,
accessKeyId: tt.fields.accessKeyId,
secretKey: tt.fields.secretKey,
}
got, got1 := d.parseDataPath()
if got != tt.want {
t.Errorf("dataStream.parseDataPath() got = %v, want %v", got, tt.want)
}
if got1 != tt.want1 {
t.Errorf("dataStream.parseDataPath() got1 = %v, want %v", got1, tt.want1)
}
})
}
}
View
76 pkg/importer/util_test.go
@@ -0,0 +1,76 @@
package importer
import (
"io"
"net/url"
"reflect"
"testing"
)
func TestParseEnvVar(t *testing.T) {
type args struct {
envVarName string
decode bool
}
tests := []struct {
name string
args args
want string
}{
// TODO: Add test cases.
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
if got := ParseEnvVar(tt.args.envVarName, tt.args.decode); got != tt.want {
t.Errorf("ParseEnvVar() = %v, want %v", got, tt.want)
}
})
}
}
func TestParseEndpoint(t *testing.T) {
type args struct {
endpt string
}
tests := []struct {
name string
args args
want *url.URL
wantErr bool
}{
// TODO: Add test cases.
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
got, err := ParseEndpoint(tt.args.endpt)
if (err != nil) != tt.wantErr {
t.Errorf("ParseEndpoint() error = %v, wantErr %v", err, tt.wantErr)
return
}
if !reflect.DeepEqual(got, tt.want) {
t.Errorf("ParseEndpoint() = %v, want %v", got, tt.want)
}
})
}
}
func TestStreamDataToFile(t *testing.T) {
type args struct {
dataReader io.Reader
filePath string
}
tests := []struct {
name string
args args
wantErr bool
}{
// TODO: Add test cases.
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
if err := StreamDataToFile(tt.args.dataReader, tt.args.filePath); (err != nil) != tt.wantErr {
t.Errorf("StreamDataToFile() error = %v, wantErr %v", err, tt.wantErr)
}
})
}
}
View
37 test/framework/fileConversion.go
@@ -19,29 +19,26 @@ var formatTable = map[string]func(string) (string, error){
func FormatTestData(srcFile string, targetFormats ...string) (string, error) {
var (
err error
outFile = srcFile
)
outFile := srcFile
var err error
var prevFile string
for _, tf := range targetFormats {
if err != nil {
break
f, ok := formatTable[tf]
if !ok {
return "", errors.Errorf("format extension %q not recognized", tf)
}
i := 0
for ftkey, ffunc := range formatTable {
if tf == ftkey {
outFile, err = ffunc(outFile)
break
} else if i == len(formatTable)-1 {
err = errors.Errorf("format extension %q not recognized", tf)
}
i++
if len(tf) == 0 {
continue
}
}
if err != nil {
return "", errors.Wrap(err, "could not format test data")
outFile, err = f(outFile)
if prevFile != srcFile {
os.Remove(prevFile)
}
if err != nil {
return "", errors.Wrap(err, "could not format test data")
}
prevFile = outFile
}
return outFile, nil
}
@@ -50,7 +47,7 @@ func transformFile(srcFile, outfileName, osCmd string, osArgs ...string) (string
cmd := exec.Command(osCmd, osArgs...)
cout, err := cmd.CombinedOutput()
if err != nil {
return "", errors.Wrapf(err, "OS command %s %v errored with output: %v", osCmd, strings.Join(osArgs, " "), cout)
return "", errors.Wrapf(err, "OS command %s %v errored with output: %v", osCmd, strings.Join(osArgs, " "), string(cout))
}
finfo, err := os.Stat(outfileName)
if err != nil {
View
2 pkg/controller/controller_suite_test.go → ...ional/controller/controller_suite_test.go
@@ -1,6 +1,6 @@
// +build unit_test
package controller_test
package controller
import (
. "github.com/onsi/ginkgo"
View
291 test/functional/controller/controller_test.go
@@ -0,0 +1,291 @@
// +build unit_test
package controller
import (
"fmt"
. "github.com/kubevirt/containerized-data-importer/pkg/common"
. "github.com/kubevirt/containerized-data-importer/pkg/controller"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"github.com/pkg/errors"
"k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes/fake"
"k8s.io/client-go/tools/cache"
k8stesting "k8s.io/client-go/tools/cache/testing"
)
type operation int
const (
opAdd operation = iota
opUpdate
opDelete
)
var verboseDebug = fmt.Sprintf("%d", Vdebug)
var _ = Describe("Controller", func() {
var (
controller *Controller
fakeClient *fake.Clientset
pvcSource *k8stesting.FakePVCControllerSource
podSource *k8stesting.FakeControllerSource
stop chan struct{}
)
setUpInformers := func(pvc *v1.PersistentVolumeClaim, pod *v1.Pod, ns string, op operation, stop <-chan struct{}) {
// Populate the informer caches with test objects
var err error
pvc, err = fakeClient.CoreV1().PersistentVolumeClaims(ns).Create(pvc)
Expect(err).NotTo(HaveOccurred())
pvcSource.Add(pvc)
if pod != nil {
pod, err = fakeClient.CoreV1().Pods(ns).Create(pod)
Expect(err).NotTo(HaveOccurred())
podSource.Add(pod)
}
pvcInformer := cache.NewSharedIndexInformer(pvcSource, pvc, DEFAULT_RESYNC_PERIOD, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc})
podInformer := cache.NewSharedIndexInformer(podSource, pod, DEFAULT_RESYNC_PERIOD, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc})
controller = NewController(fakeClient, pvcInformer, podInformer, IMPORTER_DEFAULT_IMAGE, IMPORTER_DEFAULT_PULL_POLICY, verboseDebug)
go pvcInformer.Run(stop)
go podInformer.Run(stop)
Expect(cache.WaitForCacheSync(stop, pvcInformer.HasSynced)).To(BeTrue())
Expect(cache.WaitForCacheSync(stop, podInformer.HasSynced)).To(BeTrue())
}
BeforeEach(func() {
By("Setting up new fake kubernetes client")
fakeClient = fake.NewSimpleClientset()
stop = make(chan struct{})
By("Setting up new fake controller sources")
pvcSource = k8stesting.NewFakePVCControllerSource()
podSource = k8stesting.NewFakeControllerSource()
})
AfterEach(func() {
By("Stopping informer routines")
close(stop)
})
Context("when parsing pvc annotations", func() {
type testT struct {
descr string
ns string
name string // name of test pvc
qops operation
annotations map[string]string
expectError bool
}
tests := []testT{
{
descr: "pvc, endpoint, blank ns: controller creates importer pod",
ns: "", // blank used originally in these unit tests
name: "test-pvc",
qops: opAdd,
annotations: map[string]string{AnnEndpoint: "http://www.google.com"},
expectError: false,
},
{
descr: "pvc, endpoint, non-blank ns: controller creates importer pod",
ns: "ns-a",
name: "test-pvc",
qops: opAdd,
annotations: map[string]string{AnnEndpoint: "http://www.google.com"},
expectError: false,
},
{
descr: "pvc, blank endpoint: controller does not create importer pod",
ns: "",
name: "test-pvc",
qops: opAdd,
annotations: map[string]string{},
expectError: true,
},
{
descr: "updated pvc should process",
ns: "ns-a",
name: "test-pvc",
qops: opUpdate,
annotations: map[string]string{AnnEndpoint: "http://www.google.com"},
expectError: false,
},
{
descr: "updated pvc should not process based on annotation AnnImportPod indicating already been processed",
ns: "ns-a",
name: "test-pvc",
qops: opUpdate,
annotations: map[string]string{AnnEndpoint: "http://www.google.com", AnnImportPod: "importer-test-pvc"},
expectError: true,
},
}
for _, test := range tests {
ns := test.ns
pvcName := test.name
ops := test.qops
annotations := test.annotations
fullname := pvcName
if len(ns) > 0 {
fullname = fmt.Sprintf("%s/%s", ns, pvcName)
}
exptPod := fmt.Sprintf("importer-%s-", pvcName)
exptErr := test.expectError
It(test.descr, func() {
By(fmt.Sprintf("creating in-mem pvc %q with endpt anno=%q", fullname, annotations))
pvc := createInMemPVC(ns, pvcName, annotations)
By("Creating the controller")
setUpInformers(pvc, nil, ns, ops, stop)
controller.ProcessNextPvcItem()
By("checking if importer pod is present")
pod, err := getImporterPod(fakeClient, ns, exptPod)
if exptErr {
By("Expecting no pod created")
Expect(err).ToNot(BeNil(), fmt.Sprintf("importer pod %s... should not exist\n", exptPod))
} else {
By("Expecting pod created")
Expect(err).ToNot(HaveOccurred(), fmt.Sprintf("importer pod: %v\n", err))
Expect(pod).ToNot(BeNil(), fmt.Sprintf("importer pod %q missing", exptPod))
Expect(pod.GenerateName).To(HavePrefix(exptPod))
}
})
}
})
Context("when annotating pod status in pvc", func() {
const (
ep = "https://www.google.com"
pvcName = "test-pvc"
ns = "testing-namespace"
expectPhase = v1.PodPending
)
type test struct {
desc string
podAnn map[string]string
hasVolume, shouldSucceed bool
}
tests := []test{
{
desc: fmt.Sprintf("Should annotate the pod phase in the pvc when the pod has annotation \"%s: \"", AnnCreatedBy),
podAnn: map[string]string{AnnCreatedBy: ""},
hasVolume: true,
shouldSucceed: true,
},
{
desc: fmt.Sprintf("Should do nothing when the pod is missing annotation \"%s: %s\"", AnnCreatedBy, ""),
podAnn: map[string]string{},
hasVolume: true,
shouldSucceed: false,
},
{
desc: "Should do nothing if there is no volume attached to the pod",
podAnn: map[string]string{AnnCreatedBy: ""},
hasVolume: false,
shouldSucceed: false,
},
}
var pvcAnn = map[string]string{
AnnEndpoint: ep,
}
for _, t := range tests {
podAnn := t.podAnn
ss := t.shouldSucceed
hasVol := t.hasVolume
It(t.desc, func() {
By("Setting up API objects and starting informers")
pvc := createInMemPVC(ns, pvcName, pvcAnn)
pod := createInMemPod(ns, pvcName, expectPhase, hasVol, podAnn)
pod.Status.Phase = expectPhase
setUpInformers(pvc, pod, ns, opAdd, stop)
By("Initiating pod phase write to pvc annotation")
controller.ProcessNextPodItem()
pvc, err := fakeClient.CoreV1().PersistentVolumeClaims(ns).Get(pvcName, metav1.GetOptions{})
Expect(err).NotTo(HaveOccurred())
if ss {
By("Expecting pod phase annotation in the pvc")
Expect(pvc.Annotations[AnnPodPhase]).To(Equal(string(expectPhase)))
} else {
By("Expecting no pod phase annotation in the pvc")
Expect(pvc.Annotations[AnnPodPhase]).To(BeEmpty())
}
})
}
})
})
// return an in-memory pvc using the passed-in namespace, name and the endpoint annotation.
func createInMemPVC(ns, name string, annotations map[string]string) *v1.PersistentVolumeClaim {
return &v1.PersistentVolumeClaim{
ObjectMeta: metav1.ObjectMeta{
Name: name,
Namespace: ns,
Annotations: annotations,
},
}
}
// createInMemPod generates a pod with the passed-in values.
func createInMemPod(ns, pvcName string, phase v1.PodPhase, hasVol bool, annotations map[string]string) *v1.Pod {
var volName string
if hasVol {
volName = DataVolName
}
genName := fmt.Sprintf("importer-%s-", pvcName)
return &v1.Pod{
ObjectMeta: metav1.ObjectMeta{
Namespace: ns,
GenerateName: genName,
Name: fmt.Sprintf("%s1234", genName),
Annotations: annotations,
},
Spec: v1.PodSpec{
Volumes: []v1.Volume{
{
Name: volName,
VolumeSource: v1.VolumeSource{
PersistentVolumeClaim: &v1.PersistentVolumeClaimVolumeSource{
ClaimName: pvcName,
},
},
},
},
},
Status: v1.PodStatus{
Phase: phase,
},
}
}
// getImporterPod gets the first pod with a generated name equal to the passed-in name.
// Nil is returned if no match is found.
func getImporterPod(fc *fake.Clientset, ns, podName string) (*v1.Pod, error) {
podList, err := fc.CoreV1().Pods(ns).List(metav1.ListOptions{})
if err != nil {
return nil, errors.Wrapf(err, "could not list pods in namespace %q", ns)
}
if len(podList.Items) == 0 {
return nil, errors.Errorf("Found 0 pods in namespace %q", ns)
}
for i, p := range podList.Items {
if p.GenerateName == podName {
return &podList.Items[i], nil
}
}
return nil, errors.Errorf("no pods match %s/%s", ns, podName)
}
View
2 pkg/image/validation_suite_test.go → ...functional/image/validation_suite_test.go
@@ -1,6 +1,6 @@
// +build unit
package image_test
package image
import (
. "github.com/onsi/ginkgo"
View
2 pkg/image/validation_test.go → test/functional/image/validation_test.go
@@ -1,4 +1,4 @@
package image_test
package image
import (
"bytes"
View
2 test/datastream/datastream_suite_test.go → ...ctional/importer/datastream_suite_test.go
@@ -1,6 +1,6 @@
// +build functional_test
package datastream
package importer
import (
"testing"
View
7 test/datastream/datastream_test.go → test/functional/importer/datastream_test.go
@@ -1,6 +1,6 @@
// +build functional_test
package datastream
package importer
import (
"fmt"
@@ -146,6 +146,11 @@ var _ = Describe("Streaming Data Conversion", func() {
// Generate the expected data format from the random bytes
sampleFilename, err := f.FormatTestData(fn, ff...)
Expect(err).NotTo(HaveOccurred(), "Error formatting test data.")
defer func() {
if sampleFilename != fn { // don't rm source file
os.Remove(sampleFilename) // ignore err
}
}()
Expect(sampleFilename).To(Equal(of), "Test data filename doesn't match expected file name.")
By("Creating a local dataStream w/o auth credentials")
View
2 pkg/importer/importer_suite_test.go → ...unctional/importer/importer_suite_test.go
@@ -1,6 +1,6 @@
// +build unit_test
package importer_test
package importer
import (
. "github.com/onsi/ginkgo"
View
2 pkg/importer/importer_test.go → test/functional/importer/importer_test.go
@@ -1,6 +1,6 @@
// +build unit_test
package importer_test
package importer
import (
"bytes"
View
1 test/integration/main_test.go

This file was deleted.

Oops, something went wrong.