Issue #177: test merge for disabled processes

F1bonacc1 · May 6, 2024 · 6aa0b8e · 6aa0b8e
1 parent f8c25b9
commit 6aa0b8e
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 1 deletion.
diff --git a/issues/issue_177/process-compose.override.yml b/issues/issue_177/process-compose.override.yml
@@ -0,0 +1,7 @@
+processes:
+  test:
+    disabled: false
+    command: echo bar
+  pc_log:
+    command: "tail -f -n100 process-compose-${USER}.log"
+    working_dir: "/tmp"
diff --git a/issues/issue_177/process-compose.yml b/issues/issue_177/process-compose.yml
@@ -0,0 +1,5 @@
+version: "0.5"
+processes:
+  test:
+    disabled: true
+    command: echo foo
diff --git a/src/loader/merger_test.go b/src/loader/merger_test.go
@@ -402,6 +402,30 @@ func Test_mergeProcesses(t *testing.T) {
 			},
 			wantErr: false,
 		},
+		{
+			name: "Disabled Process",
+			args: args{
+				base: types.Processes{
+					"test": types.ProcessConfig{
+						Disabled: true,
+						Command:  "echo foo",
+					},
+				},
+				override: types.Processes{
+					"test": types.ProcessConfig{
+						Disabled: false,
+						Command:  "echo bar",
+					},
+				},
+			},
+			want: types.Processes{
+				"test": types.ProcessConfig{
+					Disabled: true,
+					Command:  "echo bar",
+				},
+			},
+			wantErr: false,
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
@@ -411,7 +435,7 @@ func Test_mergeProcesses(t *testing.T) {
 				return
 			}
 			if !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("mergeProcesses() got = %v, want %v", got, tt.want)
+				t.Errorf("mergeProcesses() got = %+v, want %+v", got, tt.want)
 			}
 		})
 	}