Skip to content

Commit

Permalink
test: make root tests easier to run
Browse files Browse the repository at this point in the history
  • Loading branch information
IronCore864 committed Sep 22, 2024
1 parent 183eadf commit d9729af
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 10 deletions.
11 changes: 1 addition & 10 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,7 @@ jobs:

- name: Test
run: |
go test -c ./internals/daemon
PEBBLE_TEST_USER=runner PEBBLE_TEST_GROUP=runner sudo -E -H ./daemon.test -check.v -check.f ^execSuite\.TestUserGroup$
PEBBLE_TEST_USER=runner PEBBLE_TEST_GROUP=runner sudo -E -H ./daemon.test -check.v -check.f ^execSuite\.TestUserIDGroupID$
PEBBLE_TEST_USER=runner PEBBLE_TEST_GROUP=runner sudo -E -H ./daemon.test -check.v -check.f ^filesSuite\.TestWriteUserGroupReal$
PEBBLE_TEST_USER=runner PEBBLE_TEST_GROUP=runner sudo -E -H ./daemon.test -check.v -check.f ^filesSuite\.TestMakeDirsUserGroupReal$
go test -c ./internals/osutil
PEBBLE_TEST_USER=runner PEBBLE_TEST_GROUP=runner sudo -E -H ./osutil.test -check.v -check.f ^mkdirSuite\.TestMakeParentsChmodAndChown$
go test -c ./internals/overlord/servstate/
PEBBLE_TEST_USER=runner PEBBLE_TEST_GROUP=runner sudo -E -H ./servstate.test -check.v -check.f ^S.TestUserGroup$
PEBBLE_TEST_USER=runner PEBBLE_TEST_GROUP=runner sudo -E -H go test ./...
format:
runs-on: ubuntu-latest
Expand Down
3 changes: 3 additions & 0 deletions internals/cli/cmd_add_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,9 @@ services:
} else if path == triggerLayerPath {
c.Assert(err, check.ErrorMatches, "triggered")
} else if path == unreadableLayerPath {
if os.Getuid() == 0 {
c.Skip("requires running as non-root users")
}
c.Assert(os.IsPermission(err), check.Equals, true)
}
}
Expand Down
3 changes: 3 additions & 0 deletions internals/osutil/io_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,9 @@ func (ts *AtomicWriteTestSuite) TestAtomicWriteFileSymlinkNoFollow(c *C) {
c.Assert(os.Chmod(rodir, 0500), IsNil)
defer os.Chmod(rodir, 0700)

if os.Getuid() == 0 {
c.Skip("requires running as non-root users")
}
err := osutil.AtomicWriteFile(p, []byte("hi"), 0600, 0)
c.Assert(err, NotNil)
}
Expand Down
7 changes: 7 additions & 0 deletions internals/osutil/stat_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,10 @@ func makeTestPathInDir(c *C, dir string, path string, mode os.FileMode) string {
}

func (s *StatTestSuite) TestIsWritableDir(c *C) {
if os.Getuid() == 0 {
c.Skip("requires running as non-root users")
}

for _, t := range []struct {
path string
mode os.FileMode
Expand Down Expand Up @@ -180,6 +184,9 @@ func (s *StatTestSuite) TestExistsIsDir(c *C) {
c.Check(err, IsNil, comm)
}

if os.Getuid() == 0 {
c.Skip("requires running as non-root users")
}
p := makeTestPath(c, "foo/bar", 0)
c.Assert(os.Chmod(filepath.Dir(p), 0), IsNil)
defer os.Chmod(filepath.Dir(p), 0755)
Expand Down

0 comments on commit d9729af

Please sign in to comment.