diff options
Diffstat (limited to 'internal/testing')
| -rw-r--r-- | internal/testing/integration/frontend_test.go | 3 | ||||
| -rw-r--r-- | internal/testing/integration/worker_test.go | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/internal/testing/integration/frontend_test.go b/internal/testing/integration/frontend_test.go index e9cbe997..66a6aa6e 100644 --- a/internal/testing/integration/frontend_test.go +++ b/internal/testing/integration/frontend_test.go @@ -25,6 +25,7 @@ import ( "golang.org/x/pkgsite/internal/proxy" "golang.org/x/pkgsite/internal/proxy/proxytest" "golang.org/x/pkgsite/internal/queue" + "golang.org/x/pkgsite/internal/queue/inmemqueue" "golang.org/x/pkgsite/internal/source" "golang.org/x/pkgsite/internal/testing/htmlcheck" ) @@ -89,7 +90,7 @@ func setupQueue(ctx context.Context, t *testing.T, proxyModules []*proxytest.Mod cctx, cancel := context.WithCancel(ctx) proxyClient, teardown := proxytest.SetupTestClient(t, proxyModules) sourceClient := source.NewClient(http.DefaultClient) - q := queue.NewInMemory(cctx, 1, experimentNames, + q := inmemqueue.New(cctx, 1, experimentNames, func(ctx context.Context, mpath, version string) (_ int, err error) { return fetchserver.FetchAndUpdateState(ctx, mpath, version, proxyClient, sourceClient, testDB) }) diff --git a/internal/testing/integration/worker_test.go b/internal/testing/integration/worker_test.go index d6f75766..1edf9620 100644 --- a/internal/testing/integration/worker_test.go +++ b/internal/testing/integration/worker_test.go @@ -22,13 +22,13 @@ import ( "golang.org/x/pkgsite/internal/config" "golang.org/x/pkgsite/internal/index" "golang.org/x/pkgsite/internal/proxy" - "golang.org/x/pkgsite/internal/queue" + "golang.org/x/pkgsite/internal/queue/inmemqueue" "golang.org/x/pkgsite/internal/source" "golang.org/x/pkgsite/internal/worker" ) func setupWorker(ctx context.Context, t *testing.T, proxyClient *proxy.Client, indexClient *index.Client, - redisCacheClient *redis.Client) (*httptest.Server, *worker.Fetcher, *queue.InMemory) { + redisCacheClient *redis.Client) (*httptest.Server, *worker.Fetcher, *inmemqueue.InMemory) { t.Helper() fetcher := &worker.Fetcher{ @@ -39,7 +39,7 @@ func setupWorker(ctx context.Context, t *testing.T, proxyClient *proxy.Client, i } // TODO: it would be better if InMemory made http requests // back to worker, rather than calling fetch itself. - queue := queue.NewInMemory(ctx, 10, nil, func(ctx context.Context, mpath, version string) (int, error) { + queue := inmemqueue.New(ctx, 10, nil, func(ctx context.Context, mpath, version string) (int, error) { code, _, err := fetcher.FetchAndUpdateState(ctx, mpath, version, "test") return code, err }) |