aboutsummaryrefslogtreecommitdiff
path: root/devtools
diff options
context:
space:
mode:
authorJulie Qiu <julie@golang.org>2021-07-18 16:45:47 -0400
committerJulie Qiu <julie@golang.org>2021-07-20 16:02:26 +0000
commit0684b4181e52f739f89cdaf50d7fa035e1db1475 (patch)
tree4c10706f2f343f1ff5c3ba04c6951abe7abdea49 /devtools
parent1ebbb12a809038b10bbe4af81254996d537945d5 (diff)
downloadgo-x-pkgsite-0684b4181e52f739f89cdaf50d7fa035e1db1475.tar.xz
devtools,tests: move seed files
Seed files are moved to the relevant tests/* directories, so that they are in the same location as other config files. Change-Id: I18771d15f5ef0d7cd7f3c271749a202962736f71 Reviewed-on: https://go-review.googlesource.com/c/pkgsite/+/335392 Trust: Julie Qiu <julie@golang.org> Run-TryBot: Julie Qiu <julie@golang.org> TryBot-Result: kokoro <noreply+kokoro@google.com> Reviewed-by: Jonathan Amsterdam <jba@google.com>
Diffstat (limited to 'devtools')
-rw-r--r--devtools/cmd/seeddb/e2e_test_modules.txt26
-rw-r--r--devtools/cmd/seeddb/main.go6
-rw-r--r--devtools/cmd/seeddb/symbolsearch.txt5
3 files changed, 2 insertions, 35 deletions
diff --git a/devtools/cmd/seeddb/e2e_test_modules.txt b/devtools/cmd/seeddb/e2e_test_modules.txt
deleted file mode 100644
index c4f6a3f2..00000000
--- a/devtools/cmd/seeddb/e2e_test_modules.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2021 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-# Modules that are expected to return a 200.
-cuelang.org/go@v0.3.2
-github.com/apache/thrift@v0.14.1
-github.com/creack/pty@v1.1.11
-github.com/envoyproxy/go-control-plane@v0.9.8
-github.com/hashicorp/vault/api@v1.0.3
-github.com/jackc/pgx/v4@v4.11.0
-github.com/jba/bit@v0.2.0
-github.com/tendermint/tendermint@v0.34.10
-gocloud.dev@v0.22.0
-golang.org/x/tools@v0.0.0-20160406004205-fe1488f8abd7
-golang.org/x/tools@v0.1.1
-k8s.io/client-go@v1.5.2
-mvdan.cc/sh/v3@v3.3.0
-mvdan.cc/sh@v2.6.4+incompatible
-golang.org/x/tools/gopls@v0.6.11
-github.com/jackc/pgx@v3.6.2+incompatible
-std@v1.16.3
-
-# This module is expected to return a 404, so that the path will redirect
-# to github.com/jackc/pgx/v4/pgxpool.
-github.com/jackc/pgx/pgxpool@v3.6.2+incompatible
diff --git a/devtools/cmd/seeddb/main.go b/devtools/cmd/seeddb/main.go
index 0cdde588..9f63939a 100644
--- a/devtools/cmd/seeddb/main.go
+++ b/devtools/cmd/seeddb/main.go
@@ -34,7 +34,7 @@ import (
)
var (
- seedfile = flag.String("seed", "seed.txt", "filename containing modules for seeding the database; relative to devtools/cmd/seeddb")
+ seedfile = flag.String("seed", "devtools/cmd/seeddb/seed.txt", "filename containing modules for seeding the database; relative to devtools/cmd/seeddb")
)
func main() {
@@ -74,9 +74,7 @@ func run(ctx context.Context, db *postgres.DB, proxyURL string) error {
}
sourceClient := source.NewClient(config.SourceTimeout)
-
- sf := fmt.Sprintf("devtools/cmd/seeddb/%s", *seedfile)
- seedModules, err := readSeedFile(ctx, sf)
+ seedModules, err := readSeedFile(ctx, *seedfile)
if err != nil {
return err
}
diff --git a/devtools/cmd/seeddb/symbolsearch.txt b/devtools/cmd/seeddb/symbolsearch.txt
deleted file mode 100644
index a859cff2..00000000
--- a/devtools/cmd/seeddb/symbolsearch.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 2021 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-github.com/julieqiu/api-demo@latest