netbird/gvisor
0
0
Fork 0
mirror of https://github.com/netbirdio/gvisor.git synced 2026-05-22 17:12:49 -07:00
Code Issues Packages Projects Releases Wiki Activity

Change test to use VFS2

Browse Source 
Updates #1035

PiperOrigin-RevId: 404043283
This commit is contained in:
Fabricio Voznika
2021-10-18 13:25:18 -07:00
committed by gVisor bot
parent fb053829f9
commit 832c309ce9
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runsc/boot/fs.go
+1 -1
View File
@@ -984,7 +984,7 @@ func (c *containerMounter) createRestoreEnvironment(conf *config.Config) (*fs.Re
// Add root mount.
fd := c.fds.remove()
opts := goferMountData(fd, conf.FileAccess, "/", false /* vfs2 */, false /* lisafs */)
opts := goferMountData(fd, conf.FileAccess, "/", conf.VFS2, false /* lisafs */)
mf := fs.MountSourceFlags{}
if c.root.Readonly || conf.Overlay {
runsc/boot/loader_test.go
+6 -5
View File
@@ -552,7 +552,7 @@ func TestRestoreEnvironment(t *testing.T) {
{
Dev: "9pfs-/",
Flags: fs.MountSourceFlags{ReadOnly: true},
DataString: "trans=fd,rfdno=0,wfdno=0,privateunixsocket=true",
DataString: "trans=fd,rfdno=0,wfdno=0",
},
},
"tmpfs": {
@@ -606,11 +606,11 @@ func TestRestoreEnvironment(t *testing.T) {
{
Dev: "9pfs-/",
Flags: fs.MountSourceFlags{ReadOnly: true},
DataString: "trans=fd,rfdno=0,wfdno=0,privateunixsocket=true",
DataString: "trans=fd,rfdno=0,wfdno=0",
},
{
Dev: "9pfs-/dev/fd-foo",
DataString: "trans=fd,rfdno=1,wfdno=1,privateunixsocket=true,cache=remote_revalidating",
DataString: "trans=fd,rfdno=1,wfdno=1,cache=remote_revalidating",
},
},
"tmpfs": {
@@ -664,7 +664,7 @@ func TestRestoreEnvironment(t *testing.T) {
{
Dev: "9pfs-/",
Flags: fs.MountSourceFlags{ReadOnly: true},
DataString: "trans=fd,rfdno=0,wfdno=0,privateunixsocket=true",
DataString: "trans=fd,rfdno=0,wfdno=0",
},
},
"tmpfs": {
@@ -704,6 +704,7 @@ func TestRestoreEnvironment(t *testing.T) {
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
conf := testConfig()
conf.VFS2 = true
var ioFDs []*fd.FD
for _, ioFD := range tc.ioFDs {
ioFDs = append(ioFDs, fd.New(ioFD))
@@ -713,7 +714,7 @@ func TestRestoreEnvironment(t *testing.T) {
spec: tc.spec,
goferFDs: ioFDs,
}
mntr := newContainerMounter(&info, nil, &podMountHints{}, false /* vfs2Enabled */)
mntr := newContainerMounter(&info, nil, &podMountHints{}, conf.VFS2)
actualRenv, err := mntr.createRestoreEnvironment(conf)
if !tc.errorExpected && err != nil {
t.Fatalf("could not create restore environment for test:%s", tc.name)