NotificationsYou must be signed in to change notification settings
Fork1.1k
Star11.4k

Commiteb2960f

committed

first commit: hugodutka/dbmem-coderd/provisionerdserver

1 parent7d8b994 commiteb2960fCopy full SHA for eb2960f

File tree

3 files changed

+270

-127

lines changed

coderd/provisionerdserver

3 files changed

+270

-127

lines changed

`‎coderd/provisionerdserver/acquirer_test.go‎`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,6 @@ import (`
`18`	`18`	`"go.uber.org/goleak"`
`19`	`19`
`20`	`20`	`"github.com/coder/coder/v2/coderd/database"`
`21`		`-"github.com/coder/coder/v2/coderd/database/dbmem"`
`22`	`21`	`"github.com/coder/coder/v2/coderd/database/dbtestutil"`
`23`	`22`	`"github.com/coder/coder/v2/coderd/database/dbtime"`
`24`	`23`	`"github.com/coder/coder/v2/coderd/database/provisionerjobs"`
`@@ -34,7 +33,7 @@ func TestMain(m *testing.M) {`
`34`	`33`	`// TestAcquirer_Store tests that a database.Store is accepted as a provisionerdserver.AcquirerStore`
`35`	`34`	`funcTestAcquirer_Store(t*testing.T) {`
`36`	`35`	`t.Parallel()`
`37`		`-db:=dbmem.New()`
	`36`	`+db,_:=dbtestutil.NewDB(t)`
`38`	`37`	`ps:=pubsub.NewInMemory()`
`39`	`38`	`ctx,cancel:=context.WithTimeout(context.Background(),testutil.WaitShort)`
`40`	`39`	`defercancel()`

`‎coderd/provisionerdserver/provisionerdserver_internal_test.go‎`

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ import (`
`11`	`11`
`12`	`12`	`"github.com/coder/coder/v2/coderd/database"`
`13`	`13`	`"github.com/coder/coder/v2/coderd/database/dbgen"`
`14`		`-"github.com/coder/coder/v2/coderd/database/dbmem"`
	`14`	`+"github.com/coder/coder/v2/coderd/database/dbtestutil"`
`15`	`15`	`"github.com/coder/coder/v2/coderd/database/dbtime"`
`16`	`16`	`"github.com/coder/coder/v2/testutil"`
`17`	`17`	`)`
`@@ -21,14 +21,14 @@ func TestObtainOIDCAccessToken(t *testing.T) {`
`21`	`21`	`ctx:=context.Background()`
`22`	`22`	`t.Run("NoToken",func(t*testing.T) {`
`23`	`23`	`t.Parallel()`
`24`		`-db:=dbmem.New()`
	`24`	`+db,_:=dbtestutil.NewDB(t)`
`25`	`25`	`_,err:=obtainOIDCAccessToken(ctx,db,nil,uuid.Nil)`
`26`	`26`	`require.NoError(t,err)`
`27`	`27`	`})`
`28`	`28`	`t.Run("InvalidConfig",func(t*testing.T) {`
`29`	`29`	`// We still want OIDC to succeed even if exchanging the token fails.`
`30`	`30`	`t.Parallel()`
`31`		`-db:=dbmem.New()`
	`31`	`+db,_:=dbtestutil.NewDB(t)`
`32`	`32`	`user:=dbgen.User(t,db, database.User{})`
`33`	`33`	`dbgen.UserLink(t,db, database.UserLink{`
`34`	`34`	`UserID:user.ID,`
`@@ -40,7 +40,7 @@ func TestObtainOIDCAccessToken(t *testing.T) {`
`40`	`40`	`})`
`41`	`41`	`t.Run("MissingLink",func(t*testing.T) {`
`42`	`42`	`t.Parallel()`
`43`		`-db:=dbmem.New()`
	`43`	`+db,_:=dbtestutil.NewDB(t)`
`44`	`44`	`user:=dbgen.User(t,db, database.User{`
`45`	`45`	`LoginType:database.LoginTypeOIDC,`
`46`	`46`	`})`
`@@ -50,7 +50,7 @@ func TestObtainOIDCAccessToken(t *testing.T) {`
`50`	`50`	`})`
`51`	`51`	`t.Run("Exchange",func(t*testing.T) {`
`52`	`52`	`t.Parallel()`
`53`		`-db:=dbmem.New()`
	`53`	`+db,_:=dbtestutil.NewDB(t)`
`54`	`54`	`user:=dbgen.User(t,db, database.User{})`
`55`	`55`	`dbgen.UserLink(t,db, database.UserLink{`
`56`	`56`	`UserID:user.ID,`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commiteb2960f

File tree

3 files changed

3 files changed

`‎coderd/provisionerdserver/acquirer_test.go‎`

`‎coderd/provisionerdserver/provisionerdserver_internal_test.go‎`

0 commit comments