tests: upgrade gazelle to v0.22.0 (bazel-contrib#2658)

Jay Conrod · web-flow · commit d144b0068854 · 2020-09-22T13:38:08.000-04:00
diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
@@ -112,12 +112,12 @@ platforms:
     - "-@io_bazel_rules_go//proto/wkt:timestamp_go_proto"
     - "-@io_bazel_rules_go//proto/wkt:type_go_proto"
     - "-@io_bazel_rules_go//proto/wkt:wrappers_go_proto"
-    - "-@org_golang_x_crypto//ed25519:go_default_test"
-    - "-@org_golang_x_crypto//sha3:go_default_test"
-    - "-@org_golang_x_sys//windows/registry:go_default_test"
-    - "-@org_golang_x_sys//windows/svc/eventlog:go_default_test"
-    - "-@org_golang_x_sys//windows/svc:go_default_test"
-    - "-@org_golang_x_text//language:go_default_test"
+    - "-@org_golang_x_crypto//ed25519:ed25519_test"
+    - "-@org_golang_x_crypto//sha3:sha3_test"
+    - "-@org_golang_x_sys//windows/registry:registry_test"
+    - "-@org_golang_x_sys//windows/svc/eventlog:eventlog_test"
+    - "-@org_golang_x_sys//windows/svc:svc_test"
+    - "-@org_golang_x_text//language:language_test"
     - "-//proto:combo_grpc"
     - "-//proto:combo_proto"
     - "-//proto:gofast_grpc"
@@ -255,13 +255,13 @@ platforms:
     - "--"
     - "..."
     - "-//go/tools/bazel:bazel_test"
-    - "-@org_golang_x_crypto//ed25519:go_default_test"
-    - "-@org_golang_x_crypto//sha3:go_default_test"
-    - "-@org_golang_x_net//ipv4:go_default_test"
-    - "-@org_golang_x_sys//windows/registry:go_default_test"
-    - "-@org_golang_x_sys//windows/svc/eventlog:go_default_test"
-    - "-@org_golang_x_sys//windows/svc:go_default_test"
-    - "-@org_golang_x_text//language:go_default_test"
+    - "-@org_golang_x_crypto//ed25519:ed25519_test"
+    - "-@org_golang_x_crypto//sha3:sha3_test"
+    - "-@org_golang_x_net//ipv4:ipv4_test"
+    - "-@org_golang_x_sys//windows/registry:registry_test"
+    - "-@org_golang_x_sys//windows/svc/eventlog:eventlog_test"
+    - "-@org_golang_x_sys//windows/svc:svc_test"
+    - "-@org_golang_x_text//language:language_test"
     - "-@org_golang_x_tools//cmd/splitdwarf/internal/macho:macho_test"
     - "-@test_chdir_remote//sub:go_default_test"
     - "-//tests:buildifier_test" # requires bash
diff --git a/WORKSPACE b/WORKSPACE
@@ -89,10 +89,10 @@ bazel_skylib_workspace()
 
 http_archive(
     name = "bazel_gazelle",
-    sha256 = "d8c45ee70ec39a57e7a05e5027c32b1576cc7f16d9dd37135b0eddde45cf1b10",
+    sha256 = "d4113967ab451dd4d2d767c3ca5f927fec4b30f3b2c6f8135a2033b9c05a5687",
     urls = [
-        "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.20.0/bazel-gazelle-v0.20.0.tar.gz",
-        "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.20.0/bazel-gazelle-v0.20.0.tar.gz",
+        "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.22.0/bazel-gazelle-v0.22.0.tar.gz",
+        "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.22.0/bazel-gazelle-v0.22.0.tar.gz",
     ],
 )
 
diff --git a/tests/integration/gazelle/gazelle_test.go b/tests/integration/gazelle/gazelle_test.go
@@ -28,7 +28,7 @@ func TestMain(m *testing.M) {
 -- BUILD.bazel --
 load("@bazel_gazelle//:def.bzl", "gazelle")
 
-# gazelle:prefix example.com/g
+# gazelle:prefix example.com/hello
 gazelle(
     name = "gazelle",
 )
@@ -56,15 +56,15 @@ func TestUpdate(t *testing.T) {
 load("@io_bazel_rules_go//go:def.bzl", "go_library")
 load("@bazel_gazelle//:def.bzl", "gazelle")
 
-# gazelle:prefix example.com/g
+# gazelle:prefix example.com/hello
 gazelle(
     name = "gazelle",
 )
 
 go_library(
-    name = "go_default_library",
+    name = "hello",
     srcs = ["hello.go"],
-    importpath = "example.com/g",
+    importpath = "example.com/hello",
     visibility = ["//visibility:public"],
 )
 `)
diff --git a/tests/integration/popular_repos/BUILD.bazel b/tests/integration/popular_repos/BUILD.bazel
@@ -18,126 +18,127 @@
 test_suite(
     name = "org_golang_x_crypto",
     tests = [
-        "@org_golang_x_crypto//acme:go_default_test",
-        "@org_golang_x_crypto//acme/autocert:go_default_test",
-        "@org_golang_x_crypto//argon2:go_default_test",
-        "@org_golang_x_crypto//bcrypt:go_default_test",
-        "@org_golang_x_crypto//blake2b:go_default_test",
-        "@org_golang_x_crypto//blake2s:go_default_test",
-        "@org_golang_x_crypto//blowfish:go_default_test",
-        "@org_golang_x_crypto//bn256:go_default_test",
-        "@org_golang_x_crypto//cast5:go_default_test",
-        "@org_golang_x_crypto//chacha20poly1305:go_default_test",
-        "@org_golang_x_crypto//cryptobyte:go_default_test",
-        "@org_golang_x_crypto//curve25519:go_default_test",
-        "@org_golang_x_crypto//ed25519:go_default_test",
-        "@org_golang_x_crypto//hkdf:go_default_test",
-        "@org_golang_x_crypto//internal/chacha20:go_default_test",
-        "@org_golang_x_crypto//internal/subtle:go_default_test",
-        "@org_golang_x_crypto//md4:go_default_test",
-        "@org_golang_x_crypto//nacl/auth:go_default_test",
-        "@org_golang_x_crypto//nacl/box:go_default_test",
-        "@org_golang_x_crypto//nacl/secretbox:go_default_test",
-        "@org_golang_x_crypto//nacl/sign:go_default_test",
-        "@org_golang_x_crypto//ocsp:go_default_test",
-        "@org_golang_x_crypto//openpgp:go_default_test",
-        "@org_golang_x_crypto//openpgp/armor:go_default_test",
-        "@org_golang_x_crypto//openpgp/clearsign:go_default_test",
-        "@org_golang_x_crypto//openpgp/elgamal:go_default_test",
-        "@org_golang_x_crypto//openpgp/packet:go_default_test",
-        "@org_golang_x_crypto//openpgp/s2k:go_default_test",
-        "@org_golang_x_crypto//otr:go_default_test",
-        "@org_golang_x_crypto//pbkdf2:go_default_test",
-        "@org_golang_x_crypto//pkcs12:go_default_test",
-        "@org_golang_x_crypto//pkcs12/internal/rc2:go_default_test",
-        "@org_golang_x_crypto//poly1305:go_default_test",
-        "@org_golang_x_crypto//ripemd160:go_default_test",
-        "@org_golang_x_crypto//salsa20:go_default_test",
-        "@org_golang_x_crypto//salsa20/salsa:go_default_test",
-        "@org_golang_x_crypto//scrypt:go_default_test",
-        "@org_golang_x_crypto//sha3:go_default_test",
-        "@org_golang_x_crypto//ssh/knownhosts:go_default_test",
-        "@org_golang_x_crypto//ssh/terminal:go_default_test",
-        "@org_golang_x_crypto//tea:go_default_test",
-        "@org_golang_x_crypto//twofish:go_default_test",
-        "@org_golang_x_crypto//xtea:go_default_test",
-        "@org_golang_x_crypto//xts:go_default_test",
+        "@org_golang_x_crypto//acme:acme_test",
+        "@org_golang_x_crypto//acme/autocert:autocert_test",
+        "@org_golang_x_crypto//argon2:argon2_test",
+        "@org_golang_x_crypto//bcrypt:bcrypt_test",
+        "@org_golang_x_crypto//blake2b:blake2b_test",
+        "@org_golang_x_crypto//blake2s:blake2s_test",
+        "@org_golang_x_crypto//blowfish:blowfish_test",
+        "@org_golang_x_crypto//bn256:bn256_test",
+        "@org_golang_x_crypto//cast5:cast5_test",
+        "@org_golang_x_crypto//chacha20poly1305:chacha20poly1305_test",
+        "@org_golang_x_crypto//cryptobyte:cryptobyte_test",
+        "@org_golang_x_crypto//curve25519:curve25519_test",
+        "@org_golang_x_crypto//ed25519:ed25519_test",
+        "@org_golang_x_crypto//hkdf:hkdf_test",
+        "@org_golang_x_crypto//internal/chacha20:chacha20_test",
+        "@org_golang_x_crypto//internal/subtle:subtle_test",
+        "@org_golang_x_crypto//md4:md4_test",
+        "@org_golang_x_crypto//nacl/auth:auth_test",
+        "@org_golang_x_crypto//nacl/box:box_test",
+        "@org_golang_x_crypto//nacl/secretbox:secretbox_test",
+        "@org_golang_x_crypto//nacl/sign:sign_test",
+        "@org_golang_x_crypto//ocsp:ocsp_test",
+        "@org_golang_x_crypto//openpgp:openpgp_test",
+        "@org_golang_x_crypto//openpgp/armor:armor_test",
+        "@org_golang_x_crypto//openpgp/clearsign:clearsign_test",
+        "@org_golang_x_crypto//openpgp/elgamal:elgamal_test",
+        "@org_golang_x_crypto//openpgp/packet:packet_test",
+        "@org_golang_x_crypto//openpgp/s2k:s2k_test",
+        "@org_golang_x_crypto//otr:otr_test",
+        "@org_golang_x_crypto//pbkdf2:pbkdf2_test",
+        "@org_golang_x_crypto//pkcs12:pkcs12_test",
+        "@org_golang_x_crypto//pkcs12/internal/rc2:rc2_test",
+        "@org_golang_x_crypto//poly1305:poly1305_test",
+        "@org_golang_x_crypto//ripemd160:ripemd160_test",
+        "@org_golang_x_crypto//salsa20:salsa20_test",
+        "@org_golang_x_crypto//salsa20/salsa:salsa_test",
+        "@org_golang_x_crypto//scrypt:scrypt_test",
+        "@org_golang_x_crypto//sha3:sha3_test",
+        "@org_golang_x_crypto//ssh/knownhosts:knownhosts_test",
+        "@org_golang_x_crypto//ssh/terminal:terminal_test",
+        "@org_golang_x_crypto//tea:tea_test",
+        "@org_golang_x_crypto//twofish:twofish_test",
+        "@org_golang_x_crypto//xtea:xtea_test",
+        "@org_golang_x_crypto//xts:xts_test",
     ],
 )
 
 test_suite(
     name = "org_golang_x_net",
     tests = [
-        "@org_golang_x_net//context:go_default_test",
-        "@org_golang_x_net//context/ctxhttp:go_default_test",
-        "@org_golang_x_net//dns/dnsmessage:go_default_test",
-        "@org_golang_x_net//html:go_default_test",
-        "@org_golang_x_net//html/atom:go_default_test",
-        "@org_golang_x_net//http2/hpack:go_default_test",
-        "@org_golang_x_net//idna:go_default_test",
-        "@org_golang_x_net//internal/socket:go_default_test",
-        "@org_golang_x_net//internal/timeseries:go_default_test",
-        "@org_golang_x_net//ipv4:go_default_test",
-        "@org_golang_x_net//ipv6:go_default_test",
-        "@org_golang_x_net//lex/httplex:go_default_test",
-        "@org_golang_x_net//netutil:go_default_test",
-        "@org_golang_x_net//proxy:go_default_test",
-        "@org_golang_x_net//publicsuffix:go_default_test",
-        "@org_golang_x_net//trace:go_default_test",
-        "@org_golang_x_net//webdav:go_default_test",
-        "@org_golang_x_net//webdav/internal/xml:go_default_test",
-        "@org_golang_x_net//websocket:go_default_test",
-        "@org_golang_x_net//xsrftoken:go_default_test",
+        "@org_golang_x_net//context:context_test",
+        "@org_golang_x_net//context/ctxhttp:ctxhttp_test",
+        "@org_golang_x_net//dns/dnsmessage:dnsmessage_test",
+        "@org_golang_x_net//html:html_test",
+        "@org_golang_x_net//html/atom:atom_test",
+        "@org_golang_x_net//http2/hpack:hpack_test",
+        "@org_golang_x_net//idna:idna_test",
+        "@org_golang_x_net//internal/socket:socket_test",
+        "@org_golang_x_net//internal/timeseries:timeseries_test",
+        "@org_golang_x_net//ipv4:ipv4_test",
+        "@org_golang_x_net//ipv6:ipv6_test",
+        "@org_golang_x_net//lex/httplex:httplex_test",
+        "@org_golang_x_net//netutil:netutil_test",
+        "@org_golang_x_net//proxy:proxy_test",
+        "@org_golang_x_net//publicsuffix:publicsuffix_test",
+        "@org_golang_x_net//trace:trace_test",
+        "@org_golang_x_net//webdav:webdav_test",
+        "@org_golang_x_net//webdav/internal/xml:xml_test",
+        "@org_golang_x_net//websocket:websocket_test",
+        "@org_golang_x_net//xsrftoken:xsrftoken_test",
     ],
 )
 
 test_suite(
     name = "org_golang_x_sys",
     tests = [
-        "@org_golang_x_sys//cpu:go_default_test",
-        "@org_golang_x_sys//plan9:go_default_test",
-        "@org_golang_x_sys//windows:go_default_test",
-        "@org_golang_x_sys//windows/registry:go_default_test",
-        "@org_golang_x_sys//windows/svc:go_default_test",
-        "@org_golang_x_sys//windows/svc/eventlog:go_default_test",
-        "@org_golang_x_sys//windows/svc/mgr:go_default_test",
+        "@org_golang_x_sys//cpu:cpu_test",
+        "@org_golang_x_sys//plan9:plan9_test",
+        "@org_golang_x_sys//unix:unix_test",
+        "@org_golang_x_sys//windows:windows_test",
+        "@org_golang_x_sys//windows/registry:registry_test",
+        "@org_golang_x_sys//windows/svc:svc_test",
+        "@org_golang_x_sys//windows/svc/eventlog:eventlog_test",
+        "@org_golang_x_sys//windows/svc/mgr:mgr_test",
     ],
 )
 
 test_suite(
     name = "org_golang_x_text",
     tests = [
-        "@org_golang_x_text//cases:go_default_test",
-        "@org_golang_x_text//collate:go_default_test",
-        "@org_golang_x_text//collate/build:go_default_test",
-        "@org_golang_x_text//currency:go_default_test",
-        "@org_golang_x_text//encoding:go_default_test",
-        "@org_golang_x_text//encoding/htmlindex:go_default_test",
-        "@org_golang_x_text//encoding/ianaindex:go_default_test",
-        "@org_golang_x_text//feature/plural:go_default_test",
-        "@org_golang_x_text//internal:go_default_test",
-        "@org_golang_x_text//internal/catmsg:go_default_test",
-        "@org_golang_x_text//internal/colltab:go_default_test",
-        "@org_golang_x_text//internal/export/idna:go_default_test",
-        "@org_golang_x_text//internal/number:go_default_test",
-        "@org_golang_x_text//internal/stringset:go_default_test",
-        "@org_golang_x_text//internal/tag:go_default_test",
-        "@org_golang_x_text//internal/triegen:go_default_test",
-        "@org_golang_x_text//internal/ucd:go_default_test",
-        "@org_golang_x_text//language:go_default_test",
-        "@org_golang_x_text//language/display:go_default_test",
-        "@org_golang_x_text//message:go_default_test",
-        "@org_golang_x_text//runes:go_default_test",
-        "@org_golang_x_text//search:go_default_test",
-        "@org_golang_x_text//secure/bidirule:go_default_test",
-        "@org_golang_x_text//secure/precis:go_default_test",
-        "@org_golang_x_text//transform:go_default_test",
-        "@org_golang_x_text//unicode/bidi:go_default_test",
-        "@org_golang_x_text//unicode/cldr:go_default_test",
-        "@org_golang_x_text//unicode/norm:go_default_test",
-        "@org_golang_x_text//unicode/rangetable:go_default_test",
-        "@org_golang_x_text//unicode/runenames:go_default_test",
-        "@org_golang_x_text//width:go_default_test",
+        "@org_golang_x_text//cases:cases_test",
+        "@org_golang_x_text//collate:collate_test",
+        "@org_golang_x_text//collate/build:build_test",
+        "@org_golang_x_text//currency:currency_test",
+        "@org_golang_x_text//encoding:encoding_test",
+        "@org_golang_x_text//encoding/htmlindex:htmlindex_test",
+        "@org_golang_x_text//encoding/ianaindex:ianaindex_test",
+        "@org_golang_x_text//feature/plural:plural_test",
+        "@org_golang_x_text//internal:internal_test",
+        "@org_golang_x_text//internal/catmsg:catmsg_test",
+        "@org_golang_x_text//internal/colltab:colltab_test",
+        "@org_golang_x_text//internal/export/idna:idna_test",
+        "@org_golang_x_text//internal/number:number_test",
+        "@org_golang_x_text//internal/stringset:stringset_test",
+        "@org_golang_x_text//internal/tag:tag_test",
+        "@org_golang_x_text//internal/triegen:triegen_test",
+        "@org_golang_x_text//internal/ucd:ucd_test",
+        "@org_golang_x_text//language:language_test",
+        "@org_golang_x_text//language/display:display_test",
+        "@org_golang_x_text//message:message_test",
+        "@org_golang_x_text//runes:runes_test",
+        "@org_golang_x_text//search:search_test",
+        "@org_golang_x_text//secure/bidirule:bidirule_test",
+        "@org_golang_x_text//secure/precis:precis_test",
+        "@org_golang_x_text//transform:transform_test",
+        "@org_golang_x_text//unicode/bidi:bidi_test",
+        "@org_golang_x_text//unicode/cldr:cldr_test",
+        "@org_golang_x_text//unicode/norm:norm_test",
+        "@org_golang_x_text//unicode/rangetable:rangetable_test",
+        "@org_golang_x_text//unicode/runenames:runenames_test",
+        "@org_golang_x_text//width:width_test",
     ],
 )
 
@@ -182,29 +183,29 @@ test_suite(
 test_suite(
     name = "com_github_golang_glog",
     tests = [
-        "@com_github_golang_glog//:go_default_test",
+        "@com_github_golang_glog//:glog_test",
     ],
 )
 
 test_suite(
     name = "org_golang_x_sync",
     tests = [
-        "@org_golang_x_sync//errgroup:go_default_test",
-        "@org_golang_x_sync//semaphore:go_default_test",
-        "@org_golang_x_sync//singleflight:go_default_test",
-        "@org_golang_x_sync//syncmap:go_default_test",
+        "@org_golang_x_sync//errgroup:errgroup_test",
+        "@org_golang_x_sync//semaphore:semaphore_test",
+        "@org_golang_x_sync//singleflight:singleflight_test",
+        "@org_golang_x_sync//syncmap:syncmap_test",
     ],
 )
 
 test_suite(
     name = "org_golang_x_mod",
     tests = [
-        "@org_golang_x_mod//modfile:go_default_test",
-        "@org_golang_x_mod//module:go_default_test",
-        "@org_golang_x_mod//semver:go_default_test",
-        "@org_golang_x_mod//sumdb:go_default_test",
-        "@org_golang_x_mod//sumdb/dirhash:go_default_test",
-        "@org_golang_x_mod//sumdb/note:go_default_test",
-        "@org_golang_x_mod//sumdb/storage:go_default_test",
+        "@org_golang_x_mod//modfile:modfile_test",
+        "@org_golang_x_mod//module:module_test",
+        "@org_golang_x_mod//semver:semver_test",
+        "@org_golang_x_mod//sumdb:sumdb_test",
+        "@org_golang_x_mod//sumdb/dirhash:dirhash_test",
+        "@org_golang_x_mod//sumdb/note:note_test",
+        "@org_golang_x_mod//sumdb/storage:storage_test",
     ],
 )
diff --git a/tests/integration/popular_repos/README.rst b/tests/integration/popular_repos/README.rst
diff --git a/tests/integration/popular_repos/popular_repos.py b/tests/integration/popular_repos/popular_repos.py
