Skip to content

storage/pkg/config: cover driver options being dropped mid-chain #1058

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

Open
vtushar06 wants to merge 1 commit into
base: main
Choose a base branch
from
+24 −0
Open

storage/pkg/config: cover driver options being dropped mid-chain #1058

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 24 additions & 0 deletions storage/pkg/config/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,3 +187,27 @@ func TestZfsOptions(t *testing.T) {
t.Fatalf("Expected to find size %q, got %v", s100, doptions)
}
}

// Options set in different driver sections must all survive one call. Every
// other test here sets a single field on a fresh OptionsConfig, so a branch
// that ends the chain early goes unnoticed: 5d9d814bc3 fixed btrfs.min_space
// returning instead of appending, and this package passed either way.
func TestCombinedDriverOptions(t *testing.T) {
var options OptionsConfig
options.Btrfs.MinSpace = s100
options.Overlay.MountOpt = nodev
options.Vfs.IgnoreChownErrors = trueString
options.Zfs.Name = foobar

doptions := GetGraphDriverOptions(options)
for _, want := range []string{
"btrfs.min_space=" + s100,
"overlay.mountopt=" + nodev,
"vfs.ignore_chown_errors=" + trueString,
"zfs.fsname=" + foobar,
} {
if !searchOptions(doptions, want) {
t.Fatalf("Expected to find %q, got %v", want, doptions)
}
}
}
Loading