Skip to content
This repository was archived by the owner on Mar 24, 2023. It is now read-only.

Commit

Permalink
update afero to 1.2.2, add test for afero file modes
Browse files Browse the repository at this point in the history
  • Loading branch information
laverya committed Aug 23, 2019
1 parent 8e1d00a commit 930e0c3
Show file tree
Hide file tree
Showing 16 changed files with 345 additions and 121 deletions.
6 changes: 3 additions & 3 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

57 changes: 54 additions & 3 deletions pkg/lifecycle/render/inline/render_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,21 @@ package inline

import (
"context"
"fmt"
"io/ioutil"
"os"
"testing"

"github.com/replicatedhq/libyaml"
"github.com/spf13/afero"
"github.com/spf13/viper"
"github.com/stretchr/testify/require"

"github.com/replicatedhq/ship/pkg/api"
"github.com/replicatedhq/ship/pkg/lifecycle/render/root"
"github.com/replicatedhq/ship/pkg/templates"
"github.com/replicatedhq/ship/pkg/test-mocks/state"
"github.com/replicatedhq/ship/pkg/testing/logger"
"github.com/spf13/afero"
"github.com/spf13/viper"
"github.com/stretchr/testify/require"
)

func TestInlineRender(t *testing.T) {
Expand Down Expand Up @@ -200,3 +202,52 @@ func TestInlineRender(t *testing.T) {
})
}
}

func TestAfero(t *testing.T) {
modes := []os.FileMode{
os.ModePerm,
0666,
0555,
0444,
0333,
0222,
0111,
0000,
0644,
0600,
0700,
0733,
0777,
0755,
}
for _, mode := range modes {
t.Run(fmt.Sprint(mode)+" afero FS", func(t *testing.T) {
req := require.New(t)
aferoFS := afero.Afero{Fs: afero.NewMemMapFs()}

err := aferoFS.WriteFile("test.txt", []byte("Hello, World!"), mode)
req.NoError(err)

stat, err := aferoFS.Stat("test.txt")
req.NoError(err)

req.Equal(fmt.Sprint(mode), fmt.Sprint(stat.Mode()))
})

t.Run(fmt.Sprint(mode)+" real FS", func(t *testing.T) {
req := require.New(t)
tempdir, err := ioutil.TempDir("", "afero-test")
req.NoError(err)
defer os.RemoveAll(tempdir)
realFS := afero.Afero{Fs: afero.NewBasePathFs(afero.NewOsFs(), tempdir)}

err = realFS.WriteFile("test.txt", []byte("Hello, World!"), mode)
req.NoError(err)

stat, err := realFS.Stat("test.txt")
req.NoError(err)

req.Equal(fmt.Sprint(mode), fmt.Sprint(stat.Mode()))
})
}
}
4 changes: 2 additions & 2 deletions vendor/github.com/spf13/afero/.travis.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

47 changes: 41 additions & 6 deletions vendor/github.com/spf13/afero/basepath.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions vendor/github.com/spf13/afero/cacheOnReadFs.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

58 changes: 49 additions & 9 deletions vendor/github.com/spf13/afero/copyOnWriteFs.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions vendor/github.com/spf13/afero/go.mod

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions vendor/github.com/spf13/afero/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

27 changes: 27 additions & 0 deletions vendor/github.com/spf13/afero/lstater.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions vendor/github.com/spf13/afero/match.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions vendor/github.com/spf13/afero/mem/file.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 930e0c3

Please sign in to comment.