container/initmkdir: check path equivalence by value
All checks were successful
Test / Create distribution (push) Successful in 34s
Test / Sandbox (push) Successful in 2m7s
Test / Hakurei (push) Successful in 3m14s
Test / Hpkg (push) Successful in 3m59s
Test / Sandbox (race detector) (push) Successful in 4m27s
Test / Hakurei (race detector) (push) Successful in 5m1s
Test / Flake checks (push) Successful in 1m39s
All checks were successful
Test / Create distribution (push) Successful in 34s
Test / Sandbox (push) Successful in 2m7s
Test / Hakurei (push) Successful in 3m14s
Test / Hpkg (push) Successful in 3m59s
Test / Sandbox (race detector) (push) Successful in 4m27s
Test / Hakurei (race detector) (push) Successful in 5m1s
Test / Flake checks (push) Successful in 1m39s
Fixes regression introduced while integrating Absolute. Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
parent
e463faf649
commit
66f52407d3
@ -29,6 +29,12 @@ func (m *MkdirOp) apply(*setupState) error {
|
|||||||
return wrapErrSelf(os.MkdirAll(toSysroot(m.Path.String()), m.Perm))
|
return wrapErrSelf(os.MkdirAll(toSysroot(m.Path.String()), m.Perm))
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *MkdirOp) Is(op Op) bool { vm, ok := op.(*MkdirOp); return ok && m == vm }
|
func (m *MkdirOp) Is(op Op) bool {
|
||||||
|
vm, ok := op.(*MkdirOp)
|
||||||
|
return ok && ((m == nil && vm == nil) || (m != nil && vm != nil &&
|
||||||
|
m.Path != nil && vm.Path != nil &&
|
||||||
|
m.Path.String() == vm.Path.String() &&
|
||||||
|
m.Perm == vm.Perm))
|
||||||
|
}
|
||||||
func (*MkdirOp) prefix() string { return "creating" }
|
func (*MkdirOp) prefix() string { return "creating" }
|
||||||
func (m *MkdirOp) String() string { return fmt.Sprintf("directory %q perm %s", m.Path, m.Perm) }
|
func (m *MkdirOp) String() string { return fmt.Sprintf("directory %q perm %s", m.Path, m.Perm) }
|
||||||
|
23
container/initmkdir_test.go
Normal file
23
container/initmkdir_test.go
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
package container
|
||||||
|
|
||||||
|
import "testing"
|
||||||
|
|
||||||
|
func TestMkdirOp(t *testing.T) {
|
||||||
|
checkOpsBuilder(t, []opsBuilderTestCase{
|
||||||
|
{"etc", new(Ops).Mkdir(MustAbs("/etc/"), 0), Ops{
|
||||||
|
&MkdirOp{Path: MustAbs("/etc/")},
|
||||||
|
}},
|
||||||
|
})
|
||||||
|
|
||||||
|
checkOpIs(t, []opIsTestCase{
|
||||||
|
{"zero", new(MkdirOp), new(MkdirOp), false},
|
||||||
|
{"differs", &MkdirOp{Path: MustAbs("/"), Perm: 0755}, &MkdirOp{Path: MustAbs("/etc/"), Perm: 0755}, false},
|
||||||
|
{"equals", &MkdirOp{Path: MustAbs("/")}, &MkdirOp{Path: MustAbs("/")}, true},
|
||||||
|
})
|
||||||
|
|
||||||
|
checkOpMeta(t, []opMetaTestCase{
|
||||||
|
{"etc", &MkdirOp{
|
||||||
|
Path: MustAbs("/etc/"),
|
||||||
|
}, "creating", `directory "/etc/" perm ----------`},
|
||||||
|
})
|
||||||
|
}
|
Loading…
x
Reference in New Issue
Block a user