Commit90a9987

committed

fix more tests

1 parent0a43e32 commit90a9987Copy full SHA for 90a9987

File tree

+15

-3

lines changed

+15

-3

lines changed

Lines changed: 10 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ import (`
`7`	`7`	`"net/http/httptest"`
`8`	`8`	`"net/http/httputil"`
`9`	`9`	`"net/url"`
	`10`	`+"runtime"`
`10`	`11`	`"testing"`
`11`	`12`	`"time"`
`12`	`13`
`@@ -168,10 +169,16 @@ func TestRegions(t *testing.T) {`
`168`	`169`	`require.Equal(t,proxy.Url,regions[1].PathAppURL)`
`169`	`170`	`require.Equal(t,proxy.WildcardHostname,regions[1].WildcardHostname)`
`170`	`171`
	`172`	`+waitTime:=testutil.WaitShort/10`
	`173`	`+// windows needs more time`
	`174`	`+ifruntime.GOOS=="windows" {`
	`175`	`+waitTime=testutil.WaitShort/5`
	`176`	`+}`
	`177`	`+`
`171`	`178`	`// Unfortunately need to wait to assert createdAt/updatedAt`
`172`		`-<-time.After(testutil.WaitShort/10)`
`173`		`-require.WithinDuration(t,approxCreateTime,proxy.CreatedAt,testutil.WaitShort/10)`
`174`		`-require.WithinDuration(t,approxCreateTime,proxy.UpdatedAt,testutil.WaitShort/10)`
	`179`	`+<-time.After(waitTime)`
	`180`	`+require.WithinDuration(t,approxCreateTime,proxy.CreatedAt,waitTime)`
	`181`	`+require.WithinDuration(t,approxCreateTime,proxy.UpdatedAt,waitTime)`
`175`	`182`	`})`
`176`	`183`
`177`	`184`	`t.Run("RequireAuth",func(t*testing.T) {`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ import (`
`6`	`6`	`"encoding/json"`
`7`	`7`	`"fmt"`
`8`	`8`	`"net/http"`
	`9`	`+"runtime"`
`9`	`10`	`"sync"`
`10`	`11`	`"testing"`
`11`	`12`	`"time"`
`@@ -565,6 +566,10 @@ func TestWorkspaceSerialization(t *testing.T) {`
`565`	`566`	`})`
`566`	`567`
`567`	`568`	`t.Run("ActivityBump",func(t*testing.T) {`
	`569`	`+ifruntime.GOOS=="windows" {`
	`570`	`+t.Skip("Even though this test is expected to 'likely always fail', it doesn't fail on Windows")`
	`571`	`+}`
	`572`	`+`
`568`	`573`	`t.Log("Expected to fail. As long as quota & deadline are on the same "+`
`569`	`574`	`" table and affect the same row, this will likely always fail.")`
`570`	`575`	`// +---------------------+----------------------------------+`

Comments

(0)