diff --git a/integration/README.md b/integration/README.md index a7409d365d..1c1d7c6f65 100644 --- a/integration/README.md +++ b/integration/README.md @@ -5,7 +5,7 @@ This directory contains integration tests for the project. The tree structure generally mirrors the source code tree structure. Requirements for new files in this directory: -* Every package **must** be named after its directory with `_integration` appended +* Every package **must** be named after its directory with `_test` appended * Requiring a different package name for integration tests avoids aliasing with the main package. * Every integration test package **must** include a `main_test.go` file. diff --git a/integration/assumptions/dashboard_assumptions_test.go b/integration/assumptions/dashboard_assumptions_test.go index fb384463a2..9696aa9a4e 100644 --- a/integration/assumptions/dashboard_assumptions_test.go +++ b/integration/assumptions/dashboard_assumptions_test.go @@ -1,4 +1,4 @@ -package assumptions_integration +package assumptions_test import ( "encoding/base64" diff --git a/integration/assumptions/main_test.go b/integration/assumptions/main_test.go index b048e9795f..be27613858 100644 --- a/integration/assumptions/main_test.go +++ b/integration/assumptions/main_test.go @@ -1,4 +1,4 @@ -package assumptions_integration +package assumptions_test import ( "testing" diff --git a/integration/bundle/artifacts_test.go b/integration/bundle/artifacts_test.go index 9b4dfefd01..942c4c975c 100644 --- a/integration/bundle/artifacts_test.go +++ b/integration/bundle/artifacts_test.go @@ -1,4 +1,4 @@ -package bundle_integration +package bundle_test import ( "fmt" diff --git a/integration/bundle/basic_test.go b/integration/bundle/basic_test.go index 2c170a3514..77befb5d0c 100644 --- a/integration/bundle/basic_test.go +++ b/integration/bundle/basic_test.go @@ -1,4 +1,4 @@ -package bundle_integration +package bundle_test import ( "os" diff --git a/integration/bundle/bind_resource_test.go b/integration/bundle/bind_resource_test.go index 9bdb3d6350..374c6f346e 100644 --- a/integration/bundle/bind_resource_test.go +++ b/integration/bundle/bind_resource_test.go @@ -1,4 +1,4 @@ -package bundle_integration +package bundle_test import ( "fmt" diff --git a/integration/bundle/clusters_test.go b/integration/bundle/clusters_test.go index 42f09e4a04..d4b16c49b1 100644 --- a/integration/bundle/clusters_test.go +++ b/integration/bundle/clusters_test.go @@ -1,4 +1,4 @@ -package bundle_integration +package bundle_test import ( "fmt" diff --git a/integration/bundle/dashboards_test.go b/integration/bundle/dashboards_test.go index 995704d65a..cbca560fb2 100644 --- a/integration/bundle/dashboards_test.go +++ b/integration/bundle/dashboards_test.go @@ -1,4 +1,4 @@ -package bundle_integration +package bundle_test import ( "fmt" diff --git a/integration/bundle/deploy_test.go b/integration/bundle/deploy_test.go index 5738e6b0e5..c97149b9bb 100644 --- a/integration/bundle/deploy_test.go +++ b/integration/bundle/deploy_test.go @@ -1,4 +1,4 @@ -package bundle_integration +package bundle_test import ( "context" diff --git a/integration/bundle/deploy_then_remove_resources_test.go b/integration/bundle/deploy_then_remove_resources_test.go index 324c471174..5e0b029ccb 100644 --- a/integration/bundle/deploy_then_remove_resources_test.go +++ b/integration/bundle/deploy_then_remove_resources_test.go @@ -1,4 +1,4 @@ -package bundle_integration +package bundle_test import ( "os" diff --git a/integration/bundle/deploy_to_shared_test.go b/integration/bundle/deploy_to_shared_test.go index 9eaa768d8f..d4f1ca9875 100644 --- a/integration/bundle/deploy_to_shared_test.go +++ b/integration/bundle/deploy_to_shared_test.go @@ -1,4 +1,4 @@ -package bundle_integration +package bundle_test import ( "fmt" diff --git a/integration/bundle/deployment_state_test.go b/integration/bundle/deployment_state_test.go index 83e812a452..98b4ef530c 100644 --- a/integration/bundle/deployment_state_test.go +++ b/integration/bundle/deployment_state_test.go @@ -1,4 +1,4 @@ -package bundle_integration +package bundle_test import ( "os" diff --git a/integration/bundle/destroy_test.go b/integration/bundle/destroy_test.go index 1b5669c66d..bb9beb5083 100644 --- a/integration/bundle/destroy_test.go +++ b/integration/bundle/destroy_test.go @@ -1,4 +1,4 @@ -package bundle_integration +package bundle_test import ( "errors" diff --git a/integration/bundle/empty_bundle_test.go b/integration/bundle/empty_bundle_test.go index 07c39815b8..40dd95355c 100644 --- a/integration/bundle/empty_bundle_test.go +++ b/integration/bundle/empty_bundle_test.go @@ -1,4 +1,4 @@ -package bundle_integration +package bundle_test import ( "fmt" diff --git a/integration/bundle/environments_test.go b/integration/bundle/environments_test.go index 4729d860ac..bbdc52cb24 100644 --- a/integration/bundle/environments_test.go +++ b/integration/bundle/environments_test.go @@ -1,4 +1,4 @@ -package bundle_integration +package bundle_test import ( "testing" diff --git a/integration/bundle/generate_job_test.go b/integration/bundle/generate_job_test.go index 96ee5598c3..c466348393 100644 --- a/integration/bundle/generate_job_test.go +++ b/integration/bundle/generate_job_test.go @@ -1,4 +1,4 @@ -package bundle_integration +package bundle_test import ( "context" diff --git a/integration/bundle/generate_pipeline_test.go b/integration/bundle/generate_pipeline_test.go index 394189017a..4b05cc2e41 100644 --- a/integration/bundle/generate_pipeline_test.go +++ b/integration/bundle/generate_pipeline_test.go @@ -1,4 +1,4 @@ -package bundle_integration +package bundle_test import ( "context" diff --git a/integration/bundle/helpers.go b/integration/bundle/helpers.go index f1fba3d688..f1c87c0ef9 100644 --- a/integration/bundle/helpers.go +++ b/integration/bundle/helpers.go @@ -1,4 +1,4 @@ -package bundle_integration +package bundle_test import ( "bytes" diff --git a/integration/bundle/init_test.go b/integration/bundle/init_test.go index 06a2931f43..b1d314b531 100644 --- a/integration/bundle/init_test.go +++ b/integration/bundle/init_test.go @@ -1,4 +1,4 @@ -package bundle_integration +package bundle_test import ( "context" diff --git a/integration/bundle/job_metadata_test.go b/integration/bundle/job_metadata_test.go index ff88a1d222..a8d7a927c2 100644 --- a/integration/bundle/job_metadata_test.go +++ b/integration/bundle/job_metadata_test.go @@ -1,4 +1,4 @@ -package bundle_integration +package bundle_test import ( "context" diff --git a/integration/bundle/local_state_staleness_test.go b/integration/bundle/local_state_staleness_test.go index c38c482ee0..29283c0022 100644 --- a/integration/bundle/local_state_staleness_test.go +++ b/integration/bundle/local_state_staleness_test.go @@ -1,4 +1,4 @@ -package bundle_integration +package bundle_test import ( "context" diff --git a/integration/bundle/main_test.go b/integration/bundle/main_test.go index 04300ed6a9..1c44d0aaf6 100644 --- a/integration/bundle/main_test.go +++ b/integration/bundle/main_test.go @@ -1,4 +1,4 @@ -package bundle_integration +package bundle_test import ( "testing" diff --git a/integration/bundle/python_wheel_test.go b/integration/bundle/python_wheel_test.go index ea9c0bf5ba..3f53dc95f7 100644 --- a/integration/bundle/python_wheel_test.go +++ b/integration/bundle/python_wheel_test.go @@ -1,4 +1,4 @@ -package bundle_integration +package bundle_test import ( "testing" diff --git a/integration/bundle/spark_jar_test.go b/integration/bundle/spark_jar_test.go index c25397fa4b..2dc5cbaa82 100644 --- a/integration/bundle/spark_jar_test.go +++ b/integration/bundle/spark_jar_test.go @@ -1,4 +1,4 @@ -package bundle_integration +package bundle_test import ( "context" diff --git a/integration/bundle/validate_test.go b/integration/bundle/validate_test.go index 1547ba51d0..ebf525a72d 100644 --- a/integration/bundle/validate_test.go +++ b/integration/bundle/validate_test.go @@ -1,4 +1,4 @@ -package bundle_integration +package bundle_test import ( "context" diff --git a/integration/cmd/alerts/alerts_test.go b/integration/cmd/alerts/alerts_test.go index ba362b8369..9113f882c3 100644 --- a/integration/cmd/alerts/alerts_test.go +++ b/integration/cmd/alerts/alerts_test.go @@ -1,4 +1,4 @@ -package alerts_integration +package alerts_test import ( "testing" diff --git a/integration/cmd/alerts/main_test.go b/integration/cmd/alerts/main_test.go index e92588957f..6987ade02b 100644 --- a/integration/cmd/alerts/main_test.go +++ b/integration/cmd/alerts/main_test.go @@ -1,4 +1,4 @@ -package alerts_integration +package alerts_test import ( "testing" diff --git a/integration/cmd/api/api_test.go b/integration/cmd/api/api_test.go index 8a2c592865..7242a0bfc6 100644 --- a/integration/cmd/api/api_test.go +++ b/integration/cmd/api/api_test.go @@ -1,4 +1,4 @@ -package api_integration +package api_test import ( "encoding/json" diff --git a/integration/cmd/api/main_test.go b/integration/cmd/api/main_test.go index 440746ba7b..70d021790d 100644 --- a/integration/cmd/api/main_test.go +++ b/integration/cmd/api/main_test.go @@ -1,4 +1,4 @@ -package api_integration +package api_test import ( "testing" diff --git a/integration/cmd/auth/describe_test.go b/integration/cmd/auth/describe_test.go index 8d56de2aa3..240c7103ae 100644 --- a/integration/cmd/auth/describe_test.go +++ b/integration/cmd/auth/describe_test.go @@ -1,4 +1,4 @@ -package auth_integration +package auth_test import ( "context" diff --git a/integration/cmd/auth/main_test.go b/integration/cmd/auth/main_test.go index 20d43c5b11..97b1d740b4 100644 --- a/integration/cmd/auth/main_test.go +++ b/integration/cmd/auth/main_test.go @@ -1,4 +1,4 @@ -package auth_integration +package auth_test import ( "testing" diff --git a/integration/cmd/clusters/clusters_test.go b/integration/cmd/clusters/clusters_test.go index dc2a367ae3..132b554f12 100644 --- a/integration/cmd/clusters/clusters_test.go +++ b/integration/cmd/clusters/clusters_test.go @@ -1,4 +1,4 @@ -package clusters_integration +package clusters_test import ( "fmt" diff --git a/integration/cmd/clusters/main_test.go b/integration/cmd/clusters/main_test.go index 72d7028be9..ccd5660e70 100644 --- a/integration/cmd/clusters/main_test.go +++ b/integration/cmd/clusters/main_test.go @@ -1,4 +1,4 @@ -package clusters_integration +package clusters_test import ( "testing" diff --git a/integration/cmd/fs/cat_test.go b/integration/cmd/fs/cat_test.go index a6ccb37d3c..67e21310b1 100644 --- a/integration/cmd/fs/cat_test.go +++ b/integration/cmd/fs/cat_test.go @@ -1,4 +1,4 @@ -package fs_integration +package fs_test import ( "context" diff --git a/integration/cmd/fs/completion_test.go b/integration/cmd/fs/completion_test.go index 8b68ed559c..b90c20f789 100644 --- a/integration/cmd/fs/completion_test.go +++ b/integration/cmd/fs/completion_test.go @@ -1,4 +1,4 @@ -package fs_integration +package fs_test import ( "context" diff --git a/integration/cmd/fs/cp_test.go b/integration/cmd/fs/cp_test.go index ee3de547dd..fa507830eb 100644 --- a/integration/cmd/fs/cp_test.go +++ b/integration/cmd/fs/cp_test.go @@ -1,4 +1,4 @@ -package fs_integration +package fs_test import ( "context" diff --git a/integration/cmd/fs/helpers.go b/integration/cmd/fs/helpers.go index 37a2b5de70..cf46f48acd 100644 --- a/integration/cmd/fs/helpers.go +++ b/integration/cmd/fs/helpers.go @@ -1,4 +1,4 @@ -package fs_integration +package fs_test import ( "os" diff --git a/integration/cmd/fs/ls_test.go b/integration/cmd/fs/ls_test.go index 235827d3bb..41d9fc053b 100644 --- a/integration/cmd/fs/ls_test.go +++ b/integration/cmd/fs/ls_test.go @@ -1,4 +1,4 @@ -package fs_integration +package fs_test import ( "context" diff --git a/integration/cmd/fs/main_test.go b/integration/cmd/fs/main_test.go index a48cca594f..b9402f0b29 100644 --- a/integration/cmd/fs/main_test.go +++ b/integration/cmd/fs/main_test.go @@ -1,4 +1,4 @@ -package fs_integration +package fs_test import ( "testing" diff --git a/integration/cmd/fs/mkdir_test.go b/integration/cmd/fs/mkdir_test.go index b1b96f4ac8..93845a3dd4 100644 --- a/integration/cmd/fs/mkdir_test.go +++ b/integration/cmd/fs/mkdir_test.go @@ -1,4 +1,4 @@ -package fs_integration +package fs_test import ( "context" diff --git a/integration/cmd/fs/rm_test.go b/integration/cmd/fs/rm_test.go index 521f097fb9..c3a5349070 100644 --- a/integration/cmd/fs/rm_test.go +++ b/integration/cmd/fs/rm_test.go @@ -1,4 +1,4 @@ -package fs_integration +package fs_test import ( "context" diff --git a/integration/cmd/jobs/jobs_test.go b/integration/cmd/jobs/jobs_test.go index bee4cad9e5..b9dc2976c7 100644 --- a/integration/cmd/jobs/jobs_test.go +++ b/integration/cmd/jobs/jobs_test.go @@ -1,4 +1,4 @@ -package jobs_integration +package jobs_test import ( "encoding/json" diff --git a/integration/cmd/jobs/main_test.go b/integration/cmd/jobs/main_test.go index b35d6e38be..46369a5264 100644 --- a/integration/cmd/jobs/main_test.go +++ b/integration/cmd/jobs/main_test.go @@ -1,4 +1,4 @@ -package jobs_integration +package jobs_test import ( "testing" diff --git a/integration/cmd/main_test.go b/integration/cmd/main_test.go index d60a5f1109..a1a5586b64 100644 --- a/integration/cmd/main_test.go +++ b/integration/cmd/main_test.go @@ -1,4 +1,4 @@ -package cmd_integration +package cmd_test import ( "testing" diff --git a/integration/cmd/repos/main_test.go b/integration/cmd/repos/main_test.go index ff54fd6861..7eaa174bce 100644 --- a/integration/cmd/repos/main_test.go +++ b/integration/cmd/repos/main_test.go @@ -1,4 +1,4 @@ -package repos_integration +package repos_test import ( "testing" diff --git a/integration/cmd/repos/repos_test.go b/integration/cmd/repos/repos_test.go index 8c1b812c76..69f7e31148 100644 --- a/integration/cmd/repos/repos_test.go +++ b/integration/cmd/repos/repos_test.go @@ -1,4 +1,4 @@ -package repos_integration +package repos_test import ( "context" diff --git a/integration/cmd/secrets/main_test.go b/integration/cmd/secrets/main_test.go index 5f7f35e85b..a44d306711 100644 --- a/integration/cmd/secrets/main_test.go +++ b/integration/cmd/secrets/main_test.go @@ -1,4 +1,4 @@ -package secrets_integration +package secrets_test import ( "testing" diff --git a/integration/cmd/secrets/secrets_test.go b/integration/cmd/secrets/secrets_test.go index 6dc4db7c82..8f06699d76 100644 --- a/integration/cmd/secrets/secrets_test.go +++ b/integration/cmd/secrets/secrets_test.go @@ -1,4 +1,4 @@ -package secrets_integration +package secrets_test import ( "context" diff --git a/integration/cmd/storage_credentials/main_test.go b/integration/cmd/storage_credentials/main_test.go index 67529a907c..14d00d9660 100644 --- a/integration/cmd/storage_credentials/main_test.go +++ b/integration/cmd/storage_credentials/main_test.go @@ -1,4 +1,4 @@ -package storage_credentials_integration +package storage_credentials_test import ( "testing" diff --git a/integration/cmd/storage_credentials/storage_credentials_test.go b/integration/cmd/storage_credentials/storage_credentials_test.go index ca9e4234e6..41f21f224d 100644 --- a/integration/cmd/storage_credentials/storage_credentials_test.go +++ b/integration/cmd/storage_credentials/storage_credentials_test.go @@ -1,4 +1,4 @@ -package storage_credentials_integration +package storage_credentials_test import ( "testing" diff --git a/integration/cmd/sync/main_test.go b/integration/cmd/sync/main_test.go index 865790a65f..8d9f3ca252 100644 --- a/integration/cmd/sync/main_test.go +++ b/integration/cmd/sync/main_test.go @@ -1,4 +1,4 @@ -package sync_integration +package sync_test import ( "testing" diff --git a/integration/cmd/sync/sync_test.go b/integration/cmd/sync/sync_test.go index 4e6f989ddb..82124cc953 100644 --- a/integration/cmd/sync/sync_test.go +++ b/integration/cmd/sync/sync_test.go @@ -1,4 +1,4 @@ -package sync_integration +package sync_test import ( "context" diff --git a/integration/cmd/unknown_command_test.go b/integration/cmd/unknown_command_test.go index 4b10ef2db1..e18493940c 100644 --- a/integration/cmd/unknown_command_test.go +++ b/integration/cmd/unknown_command_test.go @@ -1,4 +1,4 @@ -package cmd_integration +package cmd_test import ( "testing" diff --git a/integration/cmd/version/main_test.go b/integration/cmd/version/main_test.go index fd65408596..4aa5e046ac 100644 --- a/integration/cmd/version/main_test.go +++ b/integration/cmd/version/main_test.go @@ -1,4 +1,4 @@ -package version_integration +package version_test import ( "testing" diff --git a/integration/cmd/version/version_test.go b/integration/cmd/version/version_test.go index e567c98137..ab00e7242f 100644 --- a/integration/cmd/version/version_test.go +++ b/integration/cmd/version/version_test.go @@ -1,4 +1,4 @@ -package version_integration +package version_test import ( "encoding/json" diff --git a/integration/cmd/workspace/main_test.go b/integration/cmd/workspace/main_test.go index 427b4d0059..40d140eac9 100644 --- a/integration/cmd/workspace/main_test.go +++ b/integration/cmd/workspace/main_test.go @@ -1,4 +1,4 @@ -package workspace_integration +package workspace_test import ( "testing" diff --git a/integration/cmd/workspace/workspace_test.go b/integration/cmd/workspace/workspace_test.go index d650d5458a..28405a09b1 100644 --- a/integration/cmd/workspace/workspace_test.go +++ b/integration/cmd/workspace/workspace_test.go @@ -1,4 +1,4 @@ -package workspace_integration +package workspace_test import ( "context" diff --git a/integration/enforce_convention_test.go b/integration/enforce_convention_test.go index 50a1be595c..cc822a6a37 100644 --- a/integration/enforce_convention_test.go +++ b/integration/enforce_convention_test.go @@ -59,12 +59,12 @@ func enumeratePackages(t *testing.T) map[string]packageInfo { return pkgmap } -// TestEnforcePackageNames checks that all integration test package names use the "_integration" suffix. +// TestEnforcePackageNames checks that all integration test package names use the "_test" suffix. // We enforce this package name to avoid package name aliasing. func TestEnforcePackageNames(t *testing.T) { pkgmap := enumeratePackages(t) for _, pkg := range pkgmap { - assert.True(t, strings.HasSuffix(pkg.Name, "_integration"), "Package name %s does not end with _integration", pkg.Name) + assert.True(t, strings.HasSuffix(pkg.Name, "_test"), "Package name %s does not end with _test", pkg.Name) } } diff --git a/integration/libs/filer/filer_test.go b/integration/libs/filer/filer_test.go index 0936748a2a..a4cfa9db3f 100644 --- a/integration/libs/filer/filer_test.go +++ b/integration/libs/filer/filer_test.go @@ -1,4 +1,4 @@ -package filer_integration +package filer_test import ( "bytes" diff --git a/integration/libs/filer/helpers.go b/integration/libs/filer/helpers.go index d6011e9391..49031b3922 100644 --- a/integration/libs/filer/helpers.go +++ b/integration/libs/filer/helpers.go @@ -1,4 +1,4 @@ -package filer_integration +package filer_test import ( "errors" diff --git a/integration/libs/filer/main_test.go b/integration/libs/filer/main_test.go index 1e419574dd..ca866d9526 100644 --- a/integration/libs/filer/main_test.go +++ b/integration/libs/filer/main_test.go @@ -1,4 +1,4 @@ -package filer_integration +package filer_test import ( "testing" diff --git a/integration/libs/git/git_clone_test.go b/integration/libs/git/git_clone_test.go index 91707fff05..53cfe6fb98 100644 --- a/integration/libs/git/git_clone_test.go +++ b/integration/libs/git/git_clone_test.go @@ -1,4 +1,4 @@ -package git_integration +package git_test import ( "context" diff --git a/integration/libs/git/git_fetch_test.go b/integration/libs/git/git_fetch_test.go index fce987a2b1..849770c3b8 100644 --- a/integration/libs/git/git_fetch_test.go +++ b/integration/libs/git/git_fetch_test.go @@ -1,4 +1,4 @@ -package git_integration +package git_test import ( "os" diff --git a/integration/libs/git/main_test.go b/integration/libs/git/main_test.go index 1a7aa1fbba..5d68e08512 100644 --- a/integration/libs/git/main_test.go +++ b/integration/libs/git/main_test.go @@ -1,4 +1,4 @@ -package git_integration +package git_test import ( "testing" diff --git a/integration/libs/locker/locker_test.go b/integration/libs/locker/locker_test.go index 020374ffa6..fcc4b346a9 100644 --- a/integration/libs/locker/locker_test.go +++ b/integration/libs/locker/locker_test.go @@ -1,4 +1,4 @@ -package locker_integration +package locker_test import ( "context" diff --git a/integration/libs/locker/main_test.go b/integration/libs/locker/main_test.go index f4036e96f7..33a883768d 100644 --- a/integration/libs/locker/main_test.go +++ b/integration/libs/locker/main_test.go @@ -1,4 +1,4 @@ -package locker_integration +package locker_test import ( "testing" diff --git a/integration/libs/tags/main_test.go b/integration/libs/tags/main_test.go index e692176215..4eaf54a20f 100644 --- a/integration/libs/tags/main_test.go +++ b/integration/libs/tags/main_test.go @@ -1,4 +1,4 @@ -package tags_integration +package tags_test import ( "testing" diff --git a/integration/libs/tags/tags_test.go b/integration/libs/tags/tags_test.go index 3f146c3e4e..2abec29a52 100644 --- a/integration/libs/tags/tags_test.go +++ b/integration/libs/tags/tags_test.go @@ -1,4 +1,4 @@ -package tags_integration +package tags_test import ( "strings" diff --git a/integration/python/main_test.go b/integration/python/main_test.go index e0bdef3cdd..b35da21e1d 100644 --- a/integration/python/main_test.go +++ b/integration/python/main_test.go @@ -1,4 +1,4 @@ -package python_integration +package python_test import ( "testing" diff --git a/integration/python/python_tasks_test.go b/integration/python/python_tasks_test.go index d819b068a1..18191291ce 100644 --- a/integration/python/python_tasks_test.go +++ b/integration/python/python_tasks_test.go @@ -1,4 +1,4 @@ -package python_integration +package python_test import ( "bytes"