dilim/runc
1
0
Fork 0
mirror of https://github.com/opencontainers/runc.git synced 2026-06-30 19:58:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

libct/utils: ResolveRootfs: remove

Browse Source 
Since commit 8850636eb3 (February 2015) this function is no longer
used (replaced by (*ConfigValidator).rootfs), so let's remove it,
together with its unit tests (which were added by commit 917c1f6d6 in
April 2016).

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
This commit is contained in:
Kir Kolyshkin
2021-11-29 19:17:52 -08:00
parent 6ff042023c
commit b950b778c2
2 changed files with 0 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libcontainer/utils/utils.go
View File

@@ -33,16 +33,6 @@ func init() {
}
}
// ResolveRootfs ensures that the current working directory is
// not a symlink and returns the absolute path to the rootfs
func ResolveRootfs(uncleanRootfs string) (string, error) {
rootfs, err := filepath.Abs(uncleanRootfs)
if err != nil {
return "", err
}
return filepath.EvalSymlinks(rootfs)
}
// ExitStatus returns the correct exit status for a process based on if it
// was signaled or exited cleanly
func ExitStatus(status unix.WaitStatus) int {

47
libcontainer/utils/utils_test.go
View File

@@ -2,8 +2,6 @@ package utils
import (
"bytes"
"os"
"path/filepath"
"testing"
"golang.org/x/sys/unix"
@@ -30,51 +28,6 @@ func TestSearchLabels(t *testing.T) {
}
}
func TestResolveRootfs(t *testing.T) {
dir := "rootfs"
if err := os.Mkdir(dir, 0o600); err != nil {
t.Fatal(err)
}
defer os.Remove(dir)
path, err := ResolveRootfs(dir)
if err != nil {
t.Fatal(err)
}
pwd, err := os.Getwd()
if err != nil {
t.Fatal(err)
}
if path != pwd+"/rootfs" {
t.Errorf("expected rootfs to be abs and was %s", path)
}
}
func TestResolveRootfsWithSymlink(t *testing.T) {
dir := "rootfs"
tmpDir, _ := filepath.EvalSymlinks(os.TempDir())
if err := os.Symlink(tmpDir, dir); err != nil {
t.Fatal(err)
}
defer os.Remove(dir)
path, err := ResolveRootfs(dir)
if err != nil {
t.Fatal(err)
}
if path != tmpDir {
t.Errorf("expected rootfs to be the real path %s and was %s", path, os.TempDir())
}
}
func TestResolveRootfsWithNonExistingDir(t *testing.T) {
_, err := ResolveRootfs("foo")
if err == nil {
t.Error("expected error to happen but received nil")
}
}
func TestExitStatus(t *testing.T) {
status := unix.WaitStatus(0)
ex := ExitStatus(status)