mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Merge pull request #4056 from alexlarsson/fix-devmapper-test
devicemapper: Fix tests on fedora
This commit is contained in:
commit
47df7a360a
1 changed files with 8 additions and 1 deletions
|
@ -136,7 +136,12 @@ type Set map[string]bool
|
||||||
|
|
||||||
func (r Set) Assert(t *testing.T, names ...string) {
|
func (r Set) Assert(t *testing.T, names ...string) {
|
||||||
for _, key := range names {
|
for _, key := range names {
|
||||||
if _, exists := r[key]; !exists {
|
required := true
|
||||||
|
if strings.HasPrefix(key, "?") {
|
||||||
|
key = key[1:]
|
||||||
|
required = false
|
||||||
|
}
|
||||||
|
if _, exists := r[key]; !exists && required {
|
||||||
t.Fatalf("Key not set: %s", key)
|
t.Fatalf("Key not set: %s", key)
|
||||||
}
|
}
|
||||||
delete(r, key)
|
delete(r, key)
|
||||||
|
@ -486,6 +491,7 @@ func TestDriverCreate(t *testing.T) {
|
||||||
"ioctl.blkgetsize",
|
"ioctl.blkgetsize",
|
||||||
"ioctl.loopsetfd",
|
"ioctl.loopsetfd",
|
||||||
"ioctl.loopsetstatus",
|
"ioctl.loopsetstatus",
|
||||||
|
"?ioctl.loopctlgetfree",
|
||||||
)
|
)
|
||||||
|
|
||||||
if err := d.Create("1", ""); err != nil {
|
if err := d.Create("1", ""); err != nil {
|
||||||
|
@ -603,6 +609,7 @@ func TestDriverRemove(t *testing.T) {
|
||||||
"ioctl.blkgetsize",
|
"ioctl.blkgetsize",
|
||||||
"ioctl.loopsetfd",
|
"ioctl.loopsetfd",
|
||||||
"ioctl.loopsetstatus",
|
"ioctl.loopsetstatus",
|
||||||
|
"?ioctl.loopctlgetfree",
|
||||||
)
|
)
|
||||||
|
|
||||||
if err := d.Create("1", ""); err != nil {
|
if err := d.Create("1", ""); err != nil {
|
||||||
|
|
Loading…
Reference in a new issue