Skip to content

Commit

Permalink
convert test-extensions to generated client
Browse files Browse the repository at this point in the history
  • Loading branch information
@deads2k
deads2k committed Sep 27, 2017
1 parent be20590 commit 31fe387
Show file tree
Hide file tree
Showing 47 changed files with 350 additions and 279 deletions.
58 changes: 29 additions & 29 deletions test/common/build/controllers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@ import (
"k8s.io/kubernetes/pkg/client/retry"

buildapi "github.com/openshift/origin/pkg/build/apis/build"
"github.com/openshift/origin/pkg/client"
buildtypedclient "github.com/openshift/origin/pkg/build/generated/internalclientset/typed/build/internalversion"
imageapi "github.com/openshift/origin/pkg/image/apis/image"
imagetypedclient "github.com/openshift/origin/pkg/image/generated/internalclientset/typed/image/internalversion"
testutil "github.com/openshift/origin/test/util"
)

Expand Down Expand Up @@ -89,19 +90,19 @@ func mockBuild() *buildapi.Build {
}
}

func RunBuildControllerTest(t testingT, osClient *client.Client, kClientset kclientset.Interface) {
func RunBuildControllerTest(t testingT, buildClient buildtypedclient.BuildsGetter, kClientset kclientset.Interface) {
// Setup an error channel
errChan := make(chan error) // go routines will send a message on this channel if an error occurs. Once this happens the test is over

// Create a build
ns := testutil.Namespace()
b, err := osClient.Builds(ns).Create(mockBuild())
b, err := buildClient.Builds(ns).Create(mockBuild())
if err != nil {
t.Fatal(err)
}

// Start watching builds for New -> Pending transition
buildWatch, err := osClient.Builds(ns).Watch(metav1.ListOptions{FieldSelector: fields.OneTermEqualSelector("metadata.name", b.Name).String(), ResourceVersion: b.ResourceVersion})
buildWatch, err := buildClient.Builds(ns).Watch(metav1.ListOptions{FieldSelector: fields.OneTermEqualSelector("metadata.name", b.Name).String(), ResourceVersion: b.ResourceVersion})
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -165,7 +166,7 @@ type buildControllerPodTest struct {
States []buildControllerPodState
}

func RunBuildControllerPodSyncTest(t testingT, osClient *client.Client, kClient kclientset.Interface) {
func RunBuildControllerPodSyncTest(t testingT, buildClient buildtypedclient.BuildsGetter, kClient kclientset.Interface) {
ns := testutil.Namespace()

tests := []buildControllerPodTest{
Expand Down Expand Up @@ -211,7 +212,7 @@ func RunBuildControllerPodSyncTest(t testingT, osClient *client.Client, kClient
errChan := make(chan error) // Will receive a value when an error occurs

// Create a build
b, err := osClient.Builds(ns).Create(mockBuild())
b, err := buildClient.Builds(ns).Create(mockBuild())
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -281,7 +282,7 @@ func RunBuildControllerPodSyncTest(t testingT, osClient *client.Client, kClient
}

shouldContinue := func() bool {
buildWatch, err := osClient.Builds(ns).Watch(metav1.ListOptions{FieldSelector: fields.OneTermEqualSelector("metadata.name", b.Name).String(), ResourceVersion: b.ResourceVersion})
buildWatch, err := buildClient.Builds(ns).Watch(metav1.ListOptions{FieldSelector: fields.OneTermEqualSelector("metadata.name", b.Name).String(), ResourceVersion: b.ResourceVersion})
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -353,40 +354,40 @@ func waitForWatch(t testingT, name string, w watchapi.Interface) *watchapi.Event
}
}

func RunImageChangeTriggerTest(t testingT, clusterAdminClient *client.Client) {
func RunImageChangeTriggerTest(t testingT, clusterAdminBuildClient buildtypedclient.BuildInterface, clusterAdminImageClient imagetypedclient.ImageInterface) {
tag := "latest"
streamName := "test-image-trigger-repo"

imageStream := mockImageStream2(tag)
imageStreamMapping := mockImageStreamMapping(imageStream.Name, "someimage", tag, "registry:8080/openshift/test-image-trigger:"+tag)

config := imageChangeBuildConfig("sti-imagestreamtag", stiStrategy("ImageStreamTag", streamName+":"+tag))
_, err := clusterAdminClient.BuildConfigs(testutil.Namespace()).Create(config)
_, err := clusterAdminBuildClient.BuildConfigs(testutil.Namespace()).Create(config)
if err != nil {
t.Fatalf("Couldn't create BuildConfig: %v", err)
}

watch, err := clusterAdminClient.Builds(testutil.Namespace()).Watch(metav1.ListOptions{})
watch, err := clusterAdminBuildClient.Builds(testutil.Namespace()).Watch(metav1.ListOptions{})
if err != nil {
t.Fatalf("Couldn't subscribe to Builds %v", err)
}
defer watch.Stop()

watch2, err := clusterAdminClient.BuildConfigs(testutil.Namespace()).Watch(metav1.ListOptions{})
watch2, err := clusterAdminBuildClient.BuildConfigs(testutil.Namespace()).Watch(metav1.ListOptions{})
if err != nil {
t.Fatalf("Couldn't subscribe to BuildConfigs %v", err)
}
defer watch2.Stop()

imageStream, err = clusterAdminClient.ImageStreams(testutil.Namespace()).Create(imageStream)
imageStream, err = clusterAdminImageClient.ImageStreams(testutil.Namespace()).Create(imageStream)
if err != nil {
t.Fatalf("Couldn't create ImageStream: %v", err)
}

// give the imagechangecontroller's buildconfig cache time to be updated with the buildconfig object
// so it doesn't get a miss when looking up the BC while processing the imagestream update event.
time.Sleep(10 * time.Second)
err = clusterAdminClient.ImageStreamMappings(testutil.Namespace()).Create(imageStreamMapping)
_, err = clusterAdminImageClient.ImageStreamMappings(testutil.Namespace()).Create(imageStreamMapping)
if err != nil {
t.Fatalf("Couldn't create Image: %v", err)
}
Expand All @@ -399,12 +400,12 @@ func RunImageChangeTriggerTest(t testingT, clusterAdminClient *client.Client) {
newBuild := event.Object.(*buildapi.Build)
strategy := newBuild.Spec.Strategy
if strategy.SourceStrategy.From.Name != "registry:8080/openshift/test-image-trigger:"+tag {
i, _ := clusterAdminClient.ImageStreams(testutil.Namespace()).Get(imageStream.Name, metav1.GetOptions{})
bc, _ := clusterAdminClient.BuildConfigs(testutil.Namespace()).Get(config.Name, metav1.GetOptions{})
i, _ := clusterAdminImageClient.ImageStreams(testutil.Namespace()).Get(imageStream.Name, metav1.GetOptions{})
bc, _ := clusterAdminBuildClient.BuildConfigs(testutil.Namespace()).Get(config.Name, metav1.GetOptions{})
t.Fatalf("Expected build with base image %s, got %s\n, imagerepo is %v\ntrigger is %s\n", "registry:8080/openshift/test-image-trigger:"+tag, strategy.SourceStrategy.From.Name, i, bc.Spec.Triggers[0].ImageChange)
}
// Wait for an update on the specific build that was added
watch3, err := clusterAdminClient.Builds(testutil.Namespace()).Watch(metav1.ListOptions{FieldSelector: fields.OneTermEqualSelector("metadata.name", newBuild.Name).String(), ResourceVersion: newBuild.ResourceVersion})
watch3, err := clusterAdminBuildClient.Builds(testutil.Namespace()).Watch(metav1.ListOptions{FieldSelector: fields.OneTermEqualSelector("metadata.name", newBuild.Name).String(), ResourceVersion: newBuild.ResourceVersion})
defer watch3.Stop()
if err != nil {
t.Fatalf("Couldn't subscribe to Builds %v", err)
Expand Down Expand Up @@ -456,7 +457,7 @@ WaitLoop2:
}

// trigger a build by posting a new image
if err := clusterAdminClient.ImageStreamMappings(testutil.Namespace()).Create(&imageapi.ImageStreamMapping{
if _, err := clusterAdminImageClient.ImageStreamMappings(testutil.Namespace()).Create(&imageapi.ImageStreamMapping{
ObjectMeta: metav1.ObjectMeta{
Namespace: testutil.Namespace(),
Name: imageStream.Name,
Expand All @@ -478,13 +479,13 @@ WaitLoop2:
newBuild = event.Object.(*buildapi.Build)
strategy = newBuild.Spec.Strategy
if strategy.SourceStrategy.From.Name != "registry:8080/openshift/test-image-trigger:ref-2-random" {
i, _ := clusterAdminClient.ImageStreams(testutil.Namespace()).Get(imageStream.Name, metav1.GetOptions{})
bc, _ := clusterAdminClient.BuildConfigs(testutil.Namespace()).Get(config.Name, metav1.GetOptions{})
i, _ := clusterAdminImageClient.ImageStreams(testutil.Namespace()).Get(imageStream.Name, metav1.GetOptions{})
bc, _ := clusterAdminBuildClient.BuildConfigs(testutil.Namespace()).Get(config.Name, metav1.GetOptions{})
t.Fatalf("Expected build with base image %s, got %s\n, imagerepo is %v\trigger is %s\n", "registry:8080/openshift/test-image-trigger:ref-2-random", strategy.SourceStrategy.From.Name, i, bc.Spec.Triggers[3].ImageChange)
}

// Listen to events on specific build
watch4, err := clusterAdminClient.Builds(testutil.Namespace()).Watch(metav1.ListOptions{FieldSelector: fields.OneTermEqualSelector("metadata.name", newBuild.Name).String(), ResourceVersion: newBuild.ResourceVersion})
watch4, err := clusterAdminBuildClient.Builds(testutil.Namespace()).Watch(metav1.ListOptions{FieldSelector: fields.OneTermEqualSelector("metadata.name", newBuild.Name).String(), ResourceVersion: newBuild.ResourceVersion})
defer watch4.Stop()

event = waitForWatch(t, "update on second build", watch4)
Expand Down Expand Up @@ -516,8 +517,7 @@ WaitLoop3:
}
}

func RunBuildDeleteTest(t testingT, clusterAdminClient *client.Client, clusterAdminKubeClientset kclientset.Interface) {

func RunBuildDeleteTest(t testingT, clusterAdminClient buildtypedclient.BuildsGetter, clusterAdminKubeClientset kclientset.Interface) {
buildWatch, err := clusterAdminClient.Builds(testutil.Namespace()).Watch(metav1.ListOptions{})
if err != nil {
t.Fatalf("Couldn't subscribe to Builds %v", err)
Expand Down Expand Up @@ -548,7 +548,7 @@ func RunBuildDeleteTest(t testingT, clusterAdminClient *client.Client, clusterAd
t.Fatalf("expected watch event type %s, got %s", e, a)
}

clusterAdminClient.Builds(testutil.Namespace()).Delete(newBuild.Name)
clusterAdminClient.Builds(testutil.Namespace()).Delete(newBuild.Name, nil)

event = waitForWatchType(t, "pod deleted due to build deleted", podWatch, watchapi.Deleted)
if e, a := watchapi.Deleted, event.Type; e != a {
Expand Down Expand Up @@ -581,7 +581,7 @@ func waitForWatchType(t testingT, name string, w watchapi.Interface, expect watc
return nil
}

func RunBuildRunningPodDeleteTest(t testingT, clusterAdminClient *client.Client, clusterAdminKubeClientset kclientset.Interface) {
func RunBuildRunningPodDeleteTest(t testingT, clusterAdminClient buildtypedclient.BuildsGetter, clusterAdminKubeClientset kclientset.Interface) {

buildWatch, err := clusterAdminClient.Builds(testutil.Namespace()).Watch(metav1.ListOptions{})
if err != nil {
Expand Down Expand Up @@ -678,7 +678,7 @@ func RunBuildRunningPodDeleteTest(t testingT, clusterAdminClient *client.Client,
}
}

func RunBuildCompletePodDeleteTest(t testingT, clusterAdminClient *client.Client, clusterAdminKubeClientset kclientset.Interface) {
func RunBuildCompletePodDeleteTest(t testingT, clusterAdminClient buildtypedclient.BuildsGetter, clusterAdminKubeClientset kclientset.Interface) {

buildWatch, err := clusterAdminClient.Builds(testutil.Namespace()).Watch(metav1.ListOptions{})
if err != nil {
Expand Down Expand Up @@ -742,20 +742,20 @@ func RunBuildCompletePodDeleteTest(t testingT, clusterAdminClient *client.Client
}
}

func RunBuildConfigChangeControllerTest(t testingT, clusterAdminClient client.Interface, clusterAdminKubeClientset kclientset.Interface) {
func RunBuildConfigChangeControllerTest(t testingT, clusterAdminBuildClient buildtypedclient.BuildInterface) {
config := configChangeBuildConfig()
created, err := clusterAdminClient.BuildConfigs(testutil.Namespace()).Create(config)
created, err := clusterAdminBuildClient.BuildConfigs(testutil.Namespace()).Create(config)
if err != nil {
t.Fatalf("Couldn't create BuildConfig: %v", err)
}

watch, err := clusterAdminClient.Builds(testutil.Namespace()).Watch(metav1.ListOptions{})
watch, err := clusterAdminBuildClient.Builds(testutil.Namespace()).Watch(metav1.ListOptions{})
if err != nil {
t.Fatalf("Couldn't subscribe to Builds %v", err)
}
defer watch.Stop()

watch2, err := clusterAdminClient.BuildConfigs(testutil.Namespace()).Watch(metav1.ListOptions{ResourceVersion: created.ResourceVersion})
watch2, err := clusterAdminBuildClient.BuildConfigs(testutil.Namespace()).Watch(metav1.ListOptions{ResourceVersion: created.ResourceVersion})
if err != nil {
t.Fatalf("Couldn't subscribe to BuildConfigs %v", err)
}
Expand Down
20 changes: 10 additions & 10 deletions test/extended/builds/build_pruning.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ var _ = g.Describe("[Feature:Builds][pruning] prune builds based on settings in
br.AssertSuccess()
}

buildConfig, err := oc.Client().BuildConfigs(oc.Namespace()).Get("myphp", metav1.GetOptions{})
buildConfig, err := oc.BuildClient().Build().BuildConfigs(oc.Namespace()).Get("myphp", metav1.GetOptions{})
if err != nil {
fmt.Fprintf(g.GinkgoWriter, "%v", err)
}
Expand All @@ -68,7 +68,7 @@ var _ = g.Describe("[Feature:Builds][pruning] prune builds based on settings in

g.By("waiting up to one minute for pruning to complete")
err = wait.PollImmediate(pollingInterval, timeout, func() (bool, error) {
builds, err = oc.Client().Builds(oc.Namespace()).List(metav1.ListOptions{})
builds, err = oc.BuildClient().Build().Builds(oc.Namespace()).List(metav1.ListOptions{})
if err != nil {
fmt.Fprintf(g.GinkgoWriter, "%v", err)
return false, err
Expand Down Expand Up @@ -104,7 +104,7 @@ var _ = g.Describe("[Feature:Builds][pruning] prune builds based on settings in
br.AssertFailure()
}

buildConfig, err := oc.Client().BuildConfigs(oc.Namespace()).Get("myphp", metav1.GetOptions{})
buildConfig, err := oc.BuildClient().Build().BuildConfigs(oc.Namespace()).Get("myphp", metav1.GetOptions{})
if err != nil {
fmt.Fprintf(g.GinkgoWriter, "%v", err)
}
Expand All @@ -113,7 +113,7 @@ var _ = g.Describe("[Feature:Builds][pruning] prune builds based on settings in

g.By("waiting up to one minute for pruning to complete")
err = wait.PollImmediate(pollingInterval, timeout, func() (bool, error) {
builds, err = oc.Client().Builds(oc.Namespace()).List(metav1.ListOptions{})
builds, err = oc.BuildClient().Build().Builds(oc.Namespace()).List(metav1.ListOptions{})
if err != nil {
fmt.Fprintf(g.GinkgoWriter, "%v", err)
return false, err
Expand Down Expand Up @@ -149,7 +149,7 @@ var _ = g.Describe("[Feature:Builds][pruning] prune builds based on settings in
err = oc.Run("cancel-build").Args(fmt.Sprintf("myphp-%d", i)).Execute()
}

buildConfig, err := oc.Client().BuildConfigs(oc.Namespace()).Get("myphp", metav1.GetOptions{})
buildConfig, err := oc.BuildClient().Build().BuildConfigs(oc.Namespace()).Get("myphp", metav1.GetOptions{})
if err != nil {
fmt.Fprintf(g.GinkgoWriter, "%v", err)
}
Expand All @@ -158,7 +158,7 @@ var _ = g.Describe("[Feature:Builds][pruning] prune builds based on settings in

g.By("waiting up to one minute for pruning to complete")
err = wait.PollImmediate(pollingInterval, timeout, func() (bool, error) {
builds, err = oc.Client().Builds(oc.Namespace()).List(metav1.ListOptions{})
builds, err = oc.BuildClient().Build().Builds(oc.Namespace()).List(metav1.ListOptions{})
if err != nil {
fmt.Fprintf(g.GinkgoWriter, "%v", err)
return false, err
Expand Down Expand Up @@ -194,7 +194,7 @@ var _ = g.Describe("[Feature:Builds][pruning] prune builds based on settings in
br.AssertFailure()
}

buildConfig, err := oc.Client().BuildConfigs(oc.Namespace()).Get("myphp", metav1.GetOptions{})
buildConfig, err := oc.BuildClient().Build().BuildConfigs(oc.Namespace()).Get("myphp", metav1.GetOptions{})
if err != nil {
fmt.Fprintf(g.GinkgoWriter, "%v", err)
}
Expand All @@ -203,7 +203,7 @@ var _ = g.Describe("[Feature:Builds][pruning] prune builds based on settings in

g.By("waiting up to one minute for pruning to complete")
err = wait.PollImmediate(pollingInterval, timeout, func() (bool, error) {
builds, err = oc.Client().Builds(oc.Namespace()).List(metav1.ListOptions{})
builds, err = oc.BuildClient().Build().Builds(oc.Namespace()).List(metav1.ListOptions{})
if err != nil {
fmt.Fprintf(g.GinkgoWriter, "%v", err)
return false, err
Expand Down Expand Up @@ -233,7 +233,7 @@ var _ = g.Describe("[Feature:Builds][pruning] prune builds based on settings in
err := oc.Run("create").Args("-f", groupBuildConfig).Execute()
o.Expect(err).NotTo(o.HaveOccurred())

buildConfig, err := oc.Client().BuildConfigs(oc.Namespace()).Get("myphp", metav1.GetOptions{})
buildConfig, err := oc.BuildClient().Build().BuildConfigs(oc.Namespace()).Get("myphp", metav1.GetOptions{})
if err != nil {
fmt.Fprintf(g.GinkgoWriter, "%v", err)
}
Expand All @@ -249,7 +249,7 @@ var _ = g.Describe("[Feature:Builds][pruning] prune builds based on settings in
err := oc.Run("create").Args("-f", legacyBuildConfig).Execute()
o.Expect(err).NotTo(o.HaveOccurred())

buildConfig, err := oc.Client().BuildConfigs(oc.Namespace()).Get("myphp", metav1.GetOptions{})
buildConfig, err := oc.BuildClient().Build().BuildConfigs(oc.Namespace()).Get("myphp", metav1.GetOptions{})
if err != nil {
fmt.Fprintf(g.GinkgoWriter, "%v", err)
}
Expand Down
6 changes: 3 additions & 3 deletions test/extended/builds/contextdir.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ var _ = g.Describe("[Feature:Builds][Slow] builds with a context directory", fun
o.Expect(err).NotTo(o.HaveOccurred())

g.By("waiting for build to finish")
err = exutil.WaitForABuild(oc.Client().Builds(oc.Namespace()), s2iBuildName, exutil.CheckBuildSuccessFn, exutil.CheckBuildFailedFn, nil)
err = exutil.WaitForABuild(oc.BuildClient().Build().Builds(oc.Namespace()), s2iBuildName, exutil.CheckBuildSuccessFn, exutil.CheckBuildFailedFn, nil)
if err != nil {
exutil.DumpBuildLogs("s2icontext", oc)
}
Expand All @@ -51,7 +51,7 @@ var _ = g.Describe("[Feature:Builds][Slow] builds with a context directory", fun
// oc.KubeFramework().WaitForAnEndpoint currently will wait forever; for now, prefacing with our WaitForADeploymentToComplete,
// which does have a timeout, since in most cases a failure in the service coming up stems from a failed deployment
g.By("waiting for a deployment")
err = exutil.WaitForDeploymentConfig(oc.KubeClient(), oc.Client(), oc.Namespace(), dcName, 1, oc)
err = exutil.WaitForDeploymentConfig(oc.KubeClient(), oc.AppsClient().Apps(), oc.Namespace(), dcName, 1, oc)
o.Expect(err).NotTo(o.HaveOccurred())

g.By("waiting for endpoint")
Expand Down Expand Up @@ -98,7 +98,7 @@ var _ = g.Describe("[Feature:Builds][Slow] builds with a context directory", fun

// build will fail if we don't use the right context dir because there won't be a dockerfile present.
g.By("waiting for build to finish")
err = exutil.WaitForABuild(oc.Client().Builds(oc.Namespace()), dockerBuildName, exutil.CheckBuildSuccessFn, exutil.CheckBuildFailedFn, nil)
err = exutil.WaitForABuild(oc.BuildClient().Build().Builds(oc.Namespace()), dockerBuildName, exutil.CheckBuildSuccessFn, exutil.CheckBuildFailedFn, nil)
if err != nil {
exutil.DumpBuildLogs("dockercontext", oc)
}
Expand Down
12 changes: 6 additions & 6 deletions test/extended/builds/controller_compat.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,32 +21,32 @@ var _ = g.Describe("[bldcompat][Slow][Compatibility] build controller", func() {

g.Describe("RunBuildControllerTest", func() {
g.It("should succeed", func() {
build.RunBuildControllerTest(g.GinkgoT(), oc.AdminClient(), oc.InternalAdminKubeClient())
build.RunBuildControllerTest(g.GinkgoT(), oc.BuildClient().Build(), oc.InternalAdminKubeClient())
})
})
g.Describe("RunBuildControllerPodSyncTest", func() {
g.It("should succeed", func() {
build.RunBuildControllerPodSyncTest(g.GinkgoT(), oc.AdminClient(), oc.InternalAdminKubeClient())
build.RunBuildControllerPodSyncTest(g.GinkgoT(), oc.BuildClient().Build(), oc.InternalAdminKubeClient())
})
})
g.Describe("RunImageChangeTriggerTest [SkipPrevControllers]", func() {
g.It("should succeed", func() {
build.RunImageChangeTriggerTest(g.GinkgoT(), oc.AdminClient())
build.RunImageChangeTriggerTest(g.GinkgoT(), oc.AdminBuildClient().Build(), oc.AdminImageClient().Image())
})
})
g.Describe("RunBuildDeleteTest", func() {
g.It("should succeed", func() {
build.RunBuildDeleteTest(g.GinkgoT(), oc.AdminClient(), oc.InternalAdminKubeClient())
build.RunBuildDeleteTest(g.GinkgoT(), oc.AdminBuildClient().Build(), oc.InternalAdminKubeClient())
})
})
g.Describe("RunBuildRunningPodDeleteTest", func() {
g.It("should succeed", func() {
build.RunBuildRunningPodDeleteTest(g.GinkgoT(), oc.AdminClient(), oc.InternalAdminKubeClient())
build.RunBuildRunningPodDeleteTest(g.GinkgoT(), oc.AdminBuildClient().Build(), oc.InternalAdminKubeClient())
})
})
g.Describe("RunBuildConfigChangeControllerTest", func() {
g.It("should succeed", func() {
build.RunBuildConfigChangeControllerTest(g.GinkgoT(), oc.AdminClient(), oc.InternalAdminKubeClient())
build.RunBuildConfigChangeControllerTest(g.GinkgoT(), oc.AdminBuildClient().Build())
})
})
})
Loading

0 comments on commit 31fe387

Please sign in to comment.