Fixes for test

kubeflow · Aug 7, 2019 · 29dae72 · 29dae72
1 parent 414b920
commit 29dae72
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 11 deletions.
diff --git a/pkg/common/util/v1/testutil/util.go b/pkg/common/util/v1/testutil/util.go
@@ -29,7 +29,9 @@ import (
 
 const (
 	LabelGroupName = "group-name"
-	LabelTFJobName = "job-name"
+	JobNameLabel   = "job-name"
+	// Deprecated label. Has to be removed later
+	DeprecatedLabelTFJobName = "tf-job-name"
 )
 
 var (
@@ -42,8 +44,9 @@ var (
 
 func GenLabels(jobName string) map[string]string {
 	return map[string]string{
-		LabelGroupName: GroupName,
-		LabelTFJobName: strings.Replace(jobName, "/", "-", -1),
+		LabelGroupName:           GroupName,
+		JobNameLabel:             strings.Replace(jobName, "/", "-", -1),
+		DeprecatedLabelTFJobName: strings.Replace(jobName, "/", "-", -1),
 	}
 }
 

diff --git a/pkg/common/util/v1beta2/testutil/util.go b/pkg/common/util/v1beta2/testutil/util.go
@@ -28,8 +28,9 @@ import (
 )
 
 const (
-	LabelGroupName = "group-name"
-	LabelTFJobName = "job-name"
+	LabelGroupName           = "group-name"
+	JobNameLabel             = "job-name"
+	DeprecatedLabelTFJobName = "tf-job-name"
 )
 
 var (
@@ -42,8 +43,9 @@ var (
 
 func GenLabels(jobName string) map[string]string {
 	return map[string]string{
-		LabelGroupName: GroupName,
-		LabelTFJobName: strings.Replace(jobName, "/", "-", -1),
+		LabelGroupName:           GroupName,
+		JobNameLabel:             strings.Replace(jobName, "/", "-", -1),
+		DeprecatedLabelTFJobName: strings.Replace(jobName, "/", "-", -1),
 	}
 }
 

diff --git a/pkg/controller.v1/tensorflow/util_test.go b/pkg/controller.v1/tensorflow/util_test.go
@@ -21,6 +21,7 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 
 	tfv1 "github.com/kubeflow/tf-operator/pkg/apis/tensorflow/v1"
+	"github.com/kubeflow/tf-operator/pkg/common/jobcontroller"
 	"github.com/kubeflow/tf-operator/pkg/common/util/v1/testutil"
 )
 
@@ -51,9 +52,10 @@ func TestGenLabels(t *testing.T) {
 	expctedKey := "test-key"
 
 	labels := testutil.GenLabels(testKey)
+	jobNamelabel := jobcontroller.JobNameLabel
 
-	if labels[labelTFJobName] != expctedKey {
-		t.Errorf("Expected %s %s, got %s", labelTFJobName, expctedKey, labels[labelTFJobName])
+	if labels[jobNamelabel] != expctedKey {
+		t.Errorf("Expected %s %s, got %s", jobNamelabel, expctedKey, jobNamelabel)
 	}
 	if labels[labelGroupName] != tfv1.GroupName {
 		t.Errorf("Expected %s %s, got %s", labelGroupName, tfv1.GroupName, labels[labelGroupName])

diff --git a/pkg/controller.v1beta2/tensorflow/util_test.go b/pkg/controller.v1beta2/tensorflow/util_test.go
@@ -21,6 +21,7 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 
 	tfv1beta2 "github.com/kubeflow/tf-operator/pkg/apis/tensorflow/v1beta2"
+	"github.com/kubeflow/tf-operator/pkg/common/jobcontroller"
 	"github.com/kubeflow/tf-operator/pkg/common/util/v1beta2/testutil"
 )
 
@@ -51,10 +52,12 @@ func TestGenLabels(t *testing.T) {
 	expctedKey := "test-key"
 
 	labels := testutil.GenLabels(testKey)
+	jobNamelabel := jobcontroller.JobNameLabel
 
-	if labels[labelTFJobName] != expctedKey {
-		t.Errorf("Expected %s %s, got %s", labelTFJobName, expctedKey, labels[labelTFJobName])
+	if labels[jobNamelabel] != expctedKey {
+		t.Errorf("Expected %s %s, got %s", jobNamelabel, expctedKey, jobNamelabel)
 	}
+
 	if labels[labelGroupName] != tfv1beta2.GroupName {
 		t.Errorf("Expected %s %s, got %s", labelGroupName, tfv1beta2.GroupName, labels[labelGroupName])
 	}