Merge pull request #243 from jodh-intel/fix-TestIsHostDevice-test

virtcontainers: Fix TestIsHostDevice test as non-root
This commit is contained in:
Sebastien Boeuf
2018-04-23 11:27:55 -07:00
committed by GitHub

View File

@@ -8,7 +8,6 @@ package virtcontainers
import ( import (
"bytes" "bytes"
"fmt" "fmt"
"github.com/stretchr/testify/assert"
"os" "os"
"os/exec" "os/exec"
"path/filepath" "path/filepath"
@@ -16,6 +15,8 @@ import (
"strings" "strings"
"syscall" "syscall"
"testing" "testing"
"github.com/stretchr/testify/assert"
) )
func TestIsSystemMount(t *testing.T) { func TestIsSystemMount(t *testing.T) {
@@ -60,8 +61,14 @@ func TestIsHostDevice(t *testing.T) {
t.Fatalf("Expected result for path %s : %v, got %v", test.mnt, test.expected, result) t.Fatalf("Expected result for path %s : %v, got %v", test.mnt, test.expected, result)
} }
} }
}
func TestIsHostDeviceCreateFile(t *testing.T) {
if os.Geteuid() != 0 {
t.Skip(testDisabledAsNonRoot)
}
// Create regular file in /dev // Create regular file in /dev
path := "/dev/foobar" path := "/dev/foobar"
f, err := os.Create(path) f, err := os.Create(path)
if err != nil { if err != nil {