Skip to content

Commit

Permalink
Test changes caused by version defaults
Browse files Browse the repository at this point in the history
  • Loading branch information
@smarterclayton
smarterclayton committed May 20, 2015
1 parent 9d9d3e9 commit b927320
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 23 deletions.
4 changes: 2 additions & 2 deletions pkg/build/registry/etcd/etcd_test.go
View file
Expand Up @@ -132,7 +132,7 @@ func TestEtcdCreateBuild(t *testing.T) {
Type: api.SourceBuildStrategyType,
SourceStrategy: &api.SourceBuildStrategy{
From: &kapi.ObjectReference{
Name: "builder/image",
Name: "builder:image",
},
},
},
Expand Down Expand Up @@ -420,7 +420,7 @@ func TestEtcdCreateBuildConfig(t *testing.T) {
Type: api.SourceBuildStrategyType,
SourceStrategy: &api.SourceBuildStrategy{
From: &kapi.ObjectReference{
Name: "builder/image",
Name: "builder:image",
},
},
},
Expand Down
43 changes: 22 additions & 21 deletions pkg/deploy/registry/etcd/etcd_test.go
View file
Expand Up @@ -16,6 +16,7 @@ import (
"github.com/GoogleCloudPlatform/kubernetes/pkg/tools/etcdtest"

"github.com/openshift/origin/pkg/api/latest"
"github.com/openshift/origin/pkg/api/v1beta1"
"github.com/openshift/origin/pkg/deploy/api"
)

Expand Down Expand Up @@ -55,7 +56,7 @@ func makeTestDefaultDeploymentConfigListKey() string {
}

func NewTestEtcd(client tools.EtcdClient) *Etcd {
return New(tools.NewEtcdHelper(client, latest.Codec, etcdtest.PathPrefix()))
return New(tools.NewEtcdHelper(client, v1beta1.Codec, etcdtest.PathPrefix()))
}

func TestEtcdListEmptyDeployments(t *testing.T) {
Expand Down Expand Up @@ -108,10 +109,10 @@ func TestEtcdListEverythingDeployments(t *testing.T) {
Node: &etcd.Node{
Nodes: []*etcd.Node{
{
Value: runtime.EncodeOrDie(latest.Codec, &api.Deployment{ObjectMeta: kapi.ObjectMeta{Name: "foo"}}),
Value: runtime.EncodeOrDie(v1beta1.Codec, &api.Deployment{ObjectMeta: kapi.ObjectMeta{Name: "foo"}}),
},
{
Value: runtime.EncodeOrDie(latest.Codec, &api.Deployment{ObjectMeta: kapi.ObjectMeta{Name: "bar"}}),
Value: runtime.EncodeOrDie(v1beta1.Codec, &api.Deployment{ObjectMeta: kapi.ObjectMeta{Name: "bar"}}),
},
},
},
Expand All @@ -137,23 +138,23 @@ func TestEtcdListFilteredDeployments(t *testing.T) {
Node: &etcd.Node{
Nodes: []*etcd.Node{
{
Value: runtime.EncodeOrDie(latest.Codec, &api.Deployment{
Value: runtime.EncodeOrDie(v1beta1.Codec, &api.Deployment{
ObjectMeta: kapi.ObjectMeta{
Name: "foo",
Labels: map[string]string{"env": "prod"},
},
}),
},
{
Value: runtime.EncodeOrDie(latest.Codec, &api.Deployment{
Value: runtime.EncodeOrDie(v1beta1.Codec, &api.Deployment{
ObjectMeta: kapi.ObjectMeta{Name: "bar",
Labels: map[string]string{"env": "dev"},
},
Status: api.DeploymentStatusRunning,
}),
},
{
Value: runtime.EncodeOrDie(latest.Codec, &api.Deployment{
Value: runtime.EncodeOrDie(v1beta1.Codec, &api.Deployment{
ObjectMeta: kapi.ObjectMeta{
Name: "baz",
Labels: map[string]string{"env": "stg"},
Expand Down Expand Up @@ -184,7 +185,7 @@ func TestEtcdListFilteredDeployments(t *testing.T) {

func TestEtcdGetDeployments(t *testing.T) {
fakeClient := tools.NewFakeEtcdClient(t)
fakeClient.Set(makeTestDefaultDeploymentKey("foo"), runtime.EncodeOrDie(latest.Codec, &api.Deployment{ObjectMeta: kapi.ObjectMeta{Name: "foo"}}), 0)
fakeClient.Set(makeTestDefaultDeploymentKey("foo"), runtime.EncodeOrDie(v1beta1.Codec, &api.Deployment{ObjectMeta: kapi.ObjectMeta{Name: "foo"}}), 0)
registry := NewTestEtcd(fakeClient)
deployment, err := registry.GetDeployment(kapi.NewDefaultContext(), "foo")
if err != nil {
Expand Down Expand Up @@ -238,7 +239,7 @@ func TestEtcdCreateDeployments(t *testing.T) {
t.Fatalf("Unexpected error %v", err)
}
var deployment api.Deployment
err = latest.Codec.DecodeInto([]byte(resp.Node.Value), &deployment)
err = v1beta1.Codec.DecodeInto([]byte(resp.Node.Value), &deployment)
if err != nil {
t.Errorf("unexpected error: %v", err)
}
Expand All @@ -253,7 +254,7 @@ func TestEtcdCreateAlreadyExistsDeployments(t *testing.T) {
fakeClient.Data[makeTestDefaultDeploymentKey("foo")] = tools.EtcdResponseWithError{
R: &etcd.Response{
Node: &etcd.Node{
Value: runtime.EncodeOrDie(latest.Codec, &api.Deployment{ObjectMeta: kapi.ObjectMeta{Name: "foo"}}),
Value: runtime.EncodeOrDie(v1beta1.Codec, &api.Deployment{ObjectMeta: kapi.ObjectMeta{Name: "foo"}}),
},
},
E: nil,
Expand Down Expand Up @@ -311,7 +312,7 @@ func TestEtcdDeleteOkDeployments(t *testing.T) {
fakeClient.Data[key] = tools.EtcdResponseWithError{
R: &etcd.Response{
Node: &etcd.Node{
Value: runtime.EncodeOrDie(latest.Codec, &api.Deployment{ObjectMeta: kapi.ObjectMeta{Name: "foo"}}),
Value: runtime.EncodeOrDie(v1beta1.Codec, &api.Deployment{ObjectMeta: kapi.ObjectMeta{Name: "foo"}}),
},
},
E: nil,
Expand Down Expand Up @@ -377,15 +378,15 @@ func TestEtcdListFilteredDeploymentConfigs(t *testing.T) {
Node: &etcd.Node{
Nodes: []*etcd.Node{
{
Value: runtime.EncodeOrDie(latest.Codec, &api.DeploymentConfig{
Value: runtime.EncodeOrDie(v1beta1.Codec, &api.DeploymentConfig{
ObjectMeta: kapi.ObjectMeta{
Name: "foo",
Labels: map[string]string{"env": "prod"},
},
}),
},
{
Value: runtime.EncodeOrDie(latest.Codec, &api.DeploymentConfig{
Value: runtime.EncodeOrDie(v1beta1.Codec, &api.DeploymentConfig{
ObjectMeta: kapi.ObjectMeta{
Name: "bar",
Labels: map[string]string{"env": "dev"},
Expand Down Expand Up @@ -414,7 +415,7 @@ func TestEtcdListFilteredDeploymentConfigs(t *testing.T) {

func TestEtcdGetDeploymentConfig(t *testing.T) {
fakeClient := tools.NewFakeEtcdClient(t)
fakeClient.Set(makeTestDefaultDeploymentConfigKey("foo"), runtime.EncodeOrDie(latest.Codec, &api.DeploymentConfig{ObjectMeta: kapi.ObjectMeta{Name: "foo"}}), 0)
fakeClient.Set(makeTestDefaultDeploymentConfigKey("foo"), runtime.EncodeOrDie(v1beta1.Codec, &api.DeploymentConfig{ObjectMeta: kapi.ObjectMeta{Name: "foo"}}), 0)
registry := NewTestEtcd(fakeClient)
deployment, err := registry.GetDeploymentConfig(kapi.NewDefaultContext(), "foo")
if err != nil {
Expand Down Expand Up @@ -469,7 +470,7 @@ func TestEtcdCreateDeploymentConfig(t *testing.T) {
t.Fatalf("Unexpected error %v", err)
}
var d api.DeploymentConfig
err = latest.Codec.DecodeInto([]byte(resp.Node.Value), &d)
err = v1beta1.Codec.DecodeInto([]byte(resp.Node.Value), &d)
if err != nil {
t.Errorf("unexpected error: %v", err)
}
Expand All @@ -484,7 +485,7 @@ func TestEtcdCreateAlreadyExistsDeploymentConfig(t *testing.T) {
fakeClient.Data[makeTestDefaultDeploymentConfigKey("foo")] = tools.EtcdResponseWithError{
R: &etcd.Response{
Node: &etcd.Node{
Value: runtime.EncodeOrDie(latest.Codec, &api.DeploymentConfig{ObjectMeta: kapi.ObjectMeta{Name: "foo"}}),
Value: runtime.EncodeOrDie(v1beta1.Codec, &api.DeploymentConfig{ObjectMeta: kapi.ObjectMeta{Name: "foo"}}),
},
},
E: nil,
Expand Down Expand Up @@ -541,7 +542,7 @@ func TestEtcdDeleteOkDeploymentConfig(t *testing.T) {
fakeClient.Data[key] = tools.EtcdResponseWithError{
R: &etcd.Response{
Node: &etcd.Node{
Value: runtime.EncodeOrDie(latest.Codec, &api.DeploymentConfig{ObjectMeta: kapi.ObjectMeta{Name: "foo"}}),
Value: runtime.EncodeOrDie(v1beta1.Codec, &api.DeploymentConfig{ObjectMeta: kapi.ObjectMeta{Name: "foo"}}),
},
},
E: nil,
Expand Down Expand Up @@ -597,7 +598,7 @@ func TestEtcdListDeploymentsInDifferentNamespaces(t *testing.T) {
Node: &etcd.Node{
Nodes: []*etcd.Node{
{
Value: runtime.EncodeOrDie(latest.Codec, &api.Deployment{ObjectMeta: kapi.ObjectMeta{Name: "foo1"}}),
Value: runtime.EncodeOrDie(v1beta1.Codec, &api.Deployment{ObjectMeta: kapi.ObjectMeta{Name: "foo1"}}),
},
},
},
Expand All @@ -609,10 +610,10 @@ func TestEtcdListDeploymentsInDifferentNamespaces(t *testing.T) {
Node: &etcd.Node{
Nodes: []*etcd.Node{
{
Value: runtime.EncodeOrDie(latest.Codec, &api.Deployment{ObjectMeta: kapi.ObjectMeta{Name: "foo2"}}),
Value: runtime.EncodeOrDie(v1beta1.Codec, &api.Deployment{ObjectMeta: kapi.ObjectMeta{Name: "foo2"}}),
},
{
Value: runtime.EncodeOrDie(latest.Codec, &api.Deployment{ObjectMeta: kapi.ObjectMeta{Name: "bar2"}}),
Value: runtime.EncodeOrDie(v1beta1.Codec, &api.Deployment{ObjectMeta: kapi.ObjectMeta{Name: "bar2"}}),
},
},
},
Expand Down Expand Up @@ -717,8 +718,8 @@ func TestEtcdGetDeploymentInDifferentNamespaces(t *testing.T) {
fakeClient := tools.NewFakeEtcdClient(t)
namespaceAlfa := kapi.WithNamespace(kapi.NewContext(), "alfa")
namespaceBravo := kapi.WithNamespace(kapi.NewContext(), "bravo")
fakeClient.Set("/deployments/alfa/foo", runtime.EncodeOrDie(latest.Codec, &api.Deployment{ObjectMeta: kapi.ObjectMeta{Name: "foo"}}), 0)
fakeClient.Set("/deployments/bravo/foo", runtime.EncodeOrDie(latest.Codec, &api.Deployment{ObjectMeta: kapi.ObjectMeta{Name: "foo"}}), 0)
fakeClient.Set("/deployments/alfa/foo", runtime.EncodeOrDie(v1beta1.Codec, &api.Deployment{ObjectMeta: kapi.ObjectMeta{Name: "foo"}}), 0)
fakeClient.Set("/deployments/bravo/foo", runtime.EncodeOrDie(v1beta1.Codec, &api.Deployment{ObjectMeta: kapi.ObjectMeta{Name: "foo"}}), 0)
registry := NewTestEtcd(fakeClient)

alfaFoo, err := registry.GetDeployment(namespaceAlfa, "foo")
Expand Down

0 comments on commit b927320

Please sign in to comment.