Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add unit tests for dm cluster CRD, discovery service, dm-master/dm-worker member manager #3310

Merged
merged 11 commits into from
Sep 27, 2020
Merged

Add unit tests for dm cluster CRD, discovery service, dm-master/dm-worker member manager #3310

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6fdaa3e
add UT for dmcluster configurations and dmapi
lichunzhu Sep 16, 2020
6c2b1be
add some unit tests
lichunzhu Sep 18, 2020
4080edb
add uts for dm-master and dm-worker member manager
lichunzhu Sep 24, 2020
a3bc614
Merge branch 'master' into addUTForDMCluster
lichunzhu Sep 24, 2020
22358e8
remove pod restarted
lichunzhu Sep 24, 2020
a47253d
fix lint
lichunzhu Sep 24, 2020
4f499f7
Merge branch 'master' into addUTForDMCluster
lonng Sep 25, 2020
b363d78
Merge branch 'master' into addUTForDMCluster
DanielZhangQD Sep 25, 2020
bda8c90
address comments
lichunzhu Sep 27, 2020
6a706bc
address comments
lichunzhu Sep 27, 2020
7b04eb3
fix bug
lichunzhu Sep 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pkg/manager/member/dm_master_member_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,10 +542,10 @@ func getNewMasterSetForDMCluster(dc *v1alpha1.DMCluster, cm *corev1.ConfigMap) (
dcName := dc.Name
baseMasterSpec := dc.BaseMasterSpec()
instanceName := dc.GetInstanceName()
masterConfigMap := ""
if cm != nil {
masterConfigMap = cm.Name
if cm == nil {
return nil, fmt.Errorf("config map for dm-master is not found, dmcluster %s/%s", dc.Namespace, dc.Name)
}
masterConfigMap := cm.Name

annMount, annVolume := annotationsMountVolume()
volMounts := []corev1.VolumeMount{
Expand Down
2 changes: 1 addition & 1 deletion pkg/manager/member/dm_master_member_manager_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1173,7 +1173,7 @@ func TestGetNewMasterSetForDMCluster(t *testing.T) {

for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
sts, err := getNewMasterSetForDMCluster(&tt.dc, nil)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There should be a case to cover the nil cm case.

sts, err := getNewMasterSetForDMCluster(&tt.dc, &corev1.ConfigMap{})
if (err != nil) != tt.wantErr {
t.Fatalf("error %v, wantErr %v", err, tt.wantErr)
}
Expand Down
6 changes: 3 additions & 3 deletions pkg/manager/member/dm_worker_member_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,10 +360,10 @@ func getNewWorkerSetForDMCluster(dc *v1alpha1.DMCluster, cm *corev1.ConfigMap) (
dcName := dc.Name
baseWorkerSpec := dc.BaseWorkerSpec()
instanceName := dc.GetInstanceName()
workerConfigMap := ""
if cm != nil {
workerConfigMap = cm.Name
if cm == nil {
return nil, fmt.Errorf("config map for dm-worker is not found, dmcluster %s/%s", dc.Namespace, dc.Name)
}
workerConfigMap := cm.Name

annMount, annVolume := annotationsMountVolume()
volMounts := []corev1.VolumeMount{
Expand Down
2 changes: 1 addition & 1 deletion pkg/manager/member/dm_worker_member_manager_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1085,7 +1085,7 @@ func TestGetNewWorkerSetForDMCluster(t *testing.T) {

for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
sts, err := getNewWorkerSetForDMCluster(&tt.dc, nil)
sts, err := getNewWorkerSetForDMCluster(&tt.dc, &corev1.ConfigMap{})
if (err != nil) != tt.wantErr {
t.Fatalf("error %v, wantErr %v", err, tt.wantErr)
}
Expand Down