Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Extract test.go files from published packages #16011

Draft
wants to merge 5 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
changes:
- type: fix
scope: pkg
description: Remove test dependencies from codegen packages
2 changes: 1 addition & 1 deletion pkg/codegen/dotnet/gen_program_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ func TestGenerateProgramVersionSelection(t *testing.T) {
Extension: "cs",
OutputFile: "Program.cs",
Check: func(t *testing.T, path string, dependencies codegen.StringSet) {
Check(t, path, dependencies, "")
test.CheckDotnet(t, path, dependencies, "")
},
GenProgram: GenerateProgram,
TestCases: []test.ProgramTest{
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

This file was deleted.

12 changes: 6 additions & 6 deletions pkg/codegen/gen_program_test/generate.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,16 +44,16 @@ func main() {
package %s

import (
"os"
"testing"
"os"
"testing"

codegen "github.com/pulumi/pulumi/pkg/v3/codegen/%s"
"github.com/pulumi/pulumi/pkg/v3/codegen/testing/test"
codegen "github.com/pulumi/pulumi/pkg/v3/codegen/%s"
"github.com/pulumi/pulumi/pkg/v3/codegen/testing/test"
)

func TestGenerateProgram(t *testing.T) {
os.Chdir("../../../%[2]s") // chdir into codegen/%[2]s
codegen.GenerateProgramBatchTest(t, test.ProgramTestBatch(%d, %d))
os.Chdir("../../../%[2]s") // chdir into codegen/%[2]s
test.GenerateProgramBatchTest("%[2]s")(t, codegen.GenerateProgram, test.ProgramTestBatch(%d, %d))
}`

n := 6
Expand Down
2 changes: 1 addition & 1 deletion pkg/codegen/go/gen_program.go
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ type GenerateProgramOptions struct {

func GenerateProgram(program *pcl.Program) (map[string][]byte, hcl.Diagnostics, error) {
pcl.MapProvidersAsResources(program)
return GenerateProgramWithOptions(program, GenerateProgramOptions{})
return GenerateProgramWithOptions(program, GenerateProgramOptions{ExternalCache: NewCache()})
}

func newGenerator(program *pcl.Program, opts GenerateProgramOptions) (*generator, error) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/codegen/go/gen_program_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ func TestGenerateProgramVersionSelection(t *testing.T) {
Extension: "go",
OutputFile: "main.go",
Check: func(t *testing.T, path string, dependencies codegen.StringSet) {
Check(t, path, dependencies, sdkPath)
test.CheckGo(t, path, dependencies, sdkPath)
},
GenProgram: func(program *pcl.Program) (map[string][]byte, hcl.Diagnostics, error) {
// Prevent tests from interfering with each other
Expand Down
4 changes: 2 additions & 2 deletions pkg/codegen/go/gen_program_test/batch1/gen_program_test.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions pkg/codegen/go/gen_program_test/batch2/gen_program_test.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions pkg/codegen/go/gen_program_test/batch3/gen_program_test.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions pkg/codegen/go/gen_program_test/batch4/gen_program_test.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions pkg/codegen/go/gen_program_test/batch5/gen_program_test.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions pkg/codegen/go/gen_program_test/batch6/gen_program_test.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

43 changes: 0 additions & 43 deletions pkg/codegen/go/gen_program_test/batchyaml/gen_program_test.go

This file was deleted.

2 changes: 1 addition & 1 deletion pkg/codegen/nodejs/gen_program_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ func TestGenerateProgramVersionSelection(t *testing.T) {
Extension: "ts",
OutputFile: "index.ts",
Check: func(t *testing.T, path string, dependencies codegen.StringSet) {
Check(t, path, dependencies, true)
test.CheckNodeJS(t, path, dependencies, true)
},
GenProgram: GenerateProgram,
TestCases: []test.ProgramTest{
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

This file was deleted.

2 changes: 1 addition & 1 deletion pkg/codegen/nodejs/gen_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ func testGeneratePackageBatch(t *testing.T, testCases []*test.SDKTest) {
},
Checks: map[string]test.CodegenCheck{
"nodejs/compile": func(t *testing.T, pwd string) {
typeCheckGeneratedPackage(t, pwd, true)
test.TypeCheckNodeJSPackage(t, pwd, true)
},
"nodejs/test": testGeneratedPackage,
},
Expand Down
1 change: 1 addition & 0 deletions pkg/codegen/nodejs/nodejs_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
package nodejs
2 changes: 1 addition & 1 deletion pkg/codegen/python/gen_program_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ func TestGenerateProgramVersionSelection(t *testing.T) {
Language: "python",
Extension: "py",
OutputFile: "__main__.py",
Check: Check,
Check: test.CheckPython,
GenProgram: GenerateProgram,
TestCases: []test.ProgramTest{
{
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.