From ec70e2695e731a44a02e3ac4600bdd4e9f76b3f7 Mon Sep 17 00:00:00 2001
From: Jay Conrod <jayconrod@gmail.com>
Date: Wed, 15 Aug 2018 13:33:30 -0400
Subject: [PATCH] Update tests ahead of Go 1.11 (#1661)

A test in the old version of org_golang_x_crypto we were testing fails
with Go 1.11. This is fixed in newer versions.
---
 tests/integration/popular_repos/BUILD.bazel       | 5 ++++-
 tests/integration/popular_repos/README.rst        | 5 ++++-
 tests/integration/popular_repos/popular_repos.bzl | 4 ++--
 tests/integration/popular_repos/popular_repos.py  | 4 ++--
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/tests/integration/popular_repos/BUILD.bazel b/tests/integration/popular_repos/BUILD.bazel
index d7a27e08af..3ff08c035a 100644
--- a/tests/integration/popular_repos/BUILD.bazel
+++ b/tests/integration/popular_repos/BUILD.bazel
@@ -20,6 +20,7 @@ test_suite(
     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",
@@ -27,15 +28,17 @@ test_suite(
         "@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//chacha20poly1305/internal/chacha20: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",
diff --git a/tests/integration/popular_repos/README.rst b/tests/integration/popular_repos/README.rst
index bfe9fbf0fd..7ff2731931 100644
--- a/tests/integration/popular_repos/README.rst
+++ b/tests/integration/popular_repos/README.rst
@@ -15,6 +15,7 @@ This runs tests from the repository `golang.org/x/crypto <https://golang.org/x/c
 
 * @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
@@ -22,15 +23,17 @@ This runs tests from the repository `golang.org/x/crypto <https://golang.org/x/c
 * @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//chacha20poly1305/internal/chacha20: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
diff --git a/tests/integration/popular_repos/popular_repos.bzl b/tests/integration/popular_repos/popular_repos.bzl
index ad35492f74..b3ee754593 100644
--- a/tests/integration/popular_repos/popular_repos.bzl
+++ b/tests/integration/popular_repos/popular_repos.bzl
@@ -27,9 +27,9 @@ def popular_repos():
         go_repository,
         name = "org_golang_x_crypto",
         importpath = "golang.org/x/crypto",
-        strip_prefix = "crypto-81e90905daefcd6fd217b62423c0908922eadb30",
+        strip_prefix = "crypto-de0752318171da717af4ce24d0a2e8626afaeb11",
         type = "zip",
-        urls = ["https://codeload.github.com/golang/crypto/zip/81e90905daefcd6fd217b62423c0908922eadb30"],
+        urls = ["https://codeload.github.com/golang/crypto/zip/de0752318171da717af4ce24d0a2e8626afaeb11"],
     )
     _maybe(
         go_repository,
diff --git a/tests/integration/popular_repos/popular_repos.py b/tests/integration/popular_repos/popular_repos.py
index 8978870084..7fe167ee77 100755
--- a/tests/integration/popular_repos/popular_repos.py
+++ b/tests/integration/popular_repos/popular_repos.py
@@ -20,8 +20,8 @@
     dict(
         name = "org_golang_x_crypto",
         importpath = "golang.org/x/crypto",
-        urls = "https://codeload.github.com/golang/crypto/zip/81e90905daefcd6fd217b62423c0908922eadb30",
-        strip_prefix = "crypto-81e90905daefcd6fd217b62423c0908922eadb30",
+        urls = "https://codeload.github.com/golang/crypto/zip/de0752318171da717af4ce24d0a2e8626afaeb11",
+        strip_prefix = "crypto-de0752318171da717af4ce24d0a2e8626afaeb11",
         type = "zip",
         excludes = [
             "ssh/agent:go_default_test",