From d9eb12feed7a0f45d4acbf478e83171f4c00210a Mon Sep 17 00:00:00 2001 From: Doug Fawley Date: Wed, 23 Jun 2021 14:15:56 -0700 Subject: [PATCH] xdsclient: move tests out of tests directory (#4535) --- xds/internal/xdsclient/{tests => }/dump_test.go | 2 +- xds/internal/xdsclient/{tests => }/loadreport_test.go | 2 +- xds/internal/xdsclient/tests/README.md | 1 - .../xdsclient/{tests/client_test.go => xdsclient_test.go} | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) rename xds/internal/xdsclient/{tests => }/dump_test.go (99%) rename xds/internal/xdsclient/{tests => }/loadreport_test.go (99%) delete mode 100644 xds/internal/xdsclient/tests/README.md rename xds/internal/xdsclient/{tests/client_test.go => xdsclient_test.go} (99%) diff --git a/xds/internal/xdsclient/tests/dump_test.go b/xds/internal/xdsclient/dump_test.go similarity index 99% rename from xds/internal/xdsclient/tests/dump_test.go rename to xds/internal/xdsclient/dump_test.go index 64c78f672..5c31b183a 100644 --- a/xds/internal/xdsclient/tests/dump_test.go +++ b/xds/internal/xdsclient/dump_test.go @@ -18,7 +18,7 @@ * */ -package tests_test +package xdsclient_test import ( "fmt" diff --git a/xds/internal/xdsclient/tests/loadreport_test.go b/xds/internal/xdsclient/loadreport_test.go similarity index 99% rename from xds/internal/xdsclient/tests/loadreport_test.go rename to xds/internal/xdsclient/loadreport_test.go index 1815f8a0a..0f29e96fc 100644 --- a/xds/internal/xdsclient/tests/loadreport_test.go +++ b/xds/internal/xdsclient/loadreport_test.go @@ -18,7 +18,7 @@ * */ -package tests_test +package xdsclient_test import ( "context" diff --git a/xds/internal/xdsclient/tests/README.md b/xds/internal/xdsclient/tests/README.md deleted file mode 100644 index 6dc940c10..000000000 --- a/xds/internal/xdsclient/tests/README.md +++ /dev/null @@ -1 +0,0 @@ -This package contains tests which cannot live in the `client` package because they need to import one of the API client packages (which itself has a dependency on the `client` package). diff --git a/xds/internal/xdsclient/tests/client_test.go b/xds/internal/xdsclient/xdsclient_test.go similarity index 99% rename from xds/internal/xdsclient/tests/client_test.go rename to xds/internal/xdsclient/xdsclient_test.go index 26c64bacd..7b33c145f 100644 --- a/xds/internal/xdsclient/tests/client_test.go +++ b/xds/internal/xdsclient/xdsclient_test.go @@ -18,7 +18,7 @@ * */ -package tests_test +package xdsclient_test import ( "testing"