fix: update tests

testcontainers · Feb 6, 2024 · 5ddb0e0 · 5ddb0e0
1 parent 3ab78d8
commit 5ddb0e0
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/docker_mounts.go b/docker_mounts.go
@@ -116,9 +116,13 @@ func mapToDockerMounts(containerMounts ContainerMounts) []mount.Mount {
 
 		if mountType == mount.TypeVolume {
 			if containerMount.VolumeOptions == nil {
-				containerMount.VolumeOptions = &mount.VolumeOptions{}
+				containerMount.VolumeOptions = &mount.VolumeOptions{
+					Labels: make(map[string]string),
+				}
+			}
+			for k, v := range GenericLabels() {
+				containerMount.VolumeOptions.Labels[k] = v
 			}
-			containerMount.VolumeOptions.Labels = GenericLabels()
 		}
 
 		mounts = append(mounts, containerMount)

diff --git a/mounts_test.go b/mounts_test.go
@@ -45,6 +45,9 @@ func TestContainerMounts_PrepareMounts(t *testing.T) {
 		Labels: GenericLabels(),
 	}
 
+	expectedLabels := GenericLabels()
+	expectedLabels["hello"] = "world"
+
 	t.Parallel()
 	tests := []struct {
 		name   string
@@ -104,9 +107,7 @@ func TestContainerMounts_PrepareMounts(t *testing.T) {
 					Target: "/data",
 					VolumeOptions: &mount.VolumeOptions{
 						NoCopy: true,
-						Labels: map[string]string{
-							"hello": "world",
-						},
+						Labels: expectedLabels,
 					},
 				},
 			},
@@ -117,9 +118,8 @@ func TestContainerMounts_PrepareMounts(t *testing.T) {
 			mounts: ContainerMounts{{Source: GenericTmpfsMountSource{}, Target: "/data"}},
 			want: []mount.Mount{
 				{
-					Type:          mount.TypeTmpfs,
-					Target:        "/data",
-					VolumeOptions: volumeOptions,
+					Type:   mount.TypeTmpfs,
+					Target: "/data",
 				},
 			},
 		},
@@ -128,10 +128,9 @@ func TestContainerMounts_PrepareMounts(t *testing.T) {
 			mounts: ContainerMounts{{Source: GenericTmpfsMountSource{}, Target: "/data", ReadOnly: true}},
 			want: []mount.Mount{
 				{
-					Type:          mount.TypeTmpfs,
-					Target:        "/data",
-					ReadOnly:      true,
-					VolumeOptions: volumeOptions,
+					Type:     mount.TypeTmpfs,
+					Target:   "/data",
+					ReadOnly: true,
 				},
 			},
 		},
@@ -156,7 +155,6 @@ func TestContainerMounts_PrepareMounts(t *testing.T) {
 						SizeBytes: 50 * 1024 * 1024,
 						Mode:      0o644,
 					},
-					VolumeOptions: volumeOptions,
 				},
 			},
 		},