Merge pull request #2260 from thaJeztah/fix_comment_formatting

Fix comment formatting and minor linting issue
This commit is contained in:
Silvin Lubecki 2020-01-16 14:55:38 +01:00 committed by GitHub
commit d05846d2cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 24 additions and 26 deletions

View File

@ -40,11 +40,9 @@ func testDefaultMetadata() store.Metadata {
} }
func testStore(t *testing.T, meta store.Metadata, tls store.ContextTLSData) (store.Store, func()) { func testStore(t *testing.T, meta store.Metadata, tls store.ContextTLSData) (store.Store, func()) {
//meta := testDefaultMetadata()
testDir, err := ioutil.TempDir("", t.Name()) testDir, err := ioutil.TempDir("", t.Name())
assert.NilError(t, err) assert.NilError(t, err)
//defer os.RemoveAll(testDir) s := &ContextStoreWithDefault{
store := &ContextStoreWithDefault{
Store: store.New(testDir, testCfg), Store: store.New(testDir, testCfg),
Resolver: func() (*DefaultContext, error) { Resolver: func() (*DefaultContext, error) {
return &DefaultContext{ return &DefaultContext{
@ -53,8 +51,8 @@ func testStore(t *testing.T, meta store.Metadata, tls store.ContextTLSData) (sto
}, nil }, nil
}, },
} }
return store, func() { return s, func() {
os.RemoveAll(testDir) _ = os.RemoveAll(testDir)
} }
} }