-
Notifications
You must be signed in to change notification settings - Fork 26
Enhance Go testing support and add integration tests #332
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
base: master
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -847,10 +847,29 @@ def go_test(name:str, srcs:list, resources:list=None, data:list|dict=None, deps: | |
| import_path = "main", | ||
| _generate_pkg_info = False, | ||
| ) | ||
| cmds, tools = _go_binary_cmds(name, static=static, definitions=definitions, gcov=cgo, test=True) | ||
| # Match go test: testing/testing.go:692 (Go 1.25.3) relies on testing.testing=true when linking tests. | ||
| testing_definition = "testing.testing=true" | ||
| if definitions is None: | ||
| test_definitions = [testing_definition] | ||
| elif isinstance(definitions, dict): | ||
| if "testing.testing" in definitions: | ||
| test_definitions = definitions | ||
| else: | ||
| test_definitions = definitions | {"testing.testing": "true"} | ||
| else: | ||
| if isinstance(definitions, str): | ||
| test_definitions = [definitions] | ||
| elif isinstance(definitions, list): | ||
| test_definitions = list(definitions) | ||
| else: | ||
| test_definitions = list(definitions) | ||
| if testing_definition not in test_definitions: | ||
| test_definitions.append(testing_definition) | ||
|
Comment on lines
+850
to
+867
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This can all be removed in favour of updating/extending https://github.com/please-build/go-rules/blob/master/build_defs/go.build_defs#L1750 - please check if that |
||
|
|
||
| cmds, tools = _go_binary_cmds(name, static=static, definitions=test_definitions, gcov=cgo, test=True) | ||
|
|
||
|
|
||
| test_cmd = f'$TEST {flags} 2>&1 | tee $TMP_DIR/test.results' | ||
| test_cmd = f'$TEST {flags} 2>&1 | tee -- "$TMP_DIR/test.results"' | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why have you made this change?
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I dded the -- here to ensure robustness. It explicitly tells tee to stop processing arguments as options, treating $TMP_DIR/test.results strictly as a file name, even if it happens to start with a hyphen. |
||
| worker_cmd = f'$(worker {worker})' if worker else "" | ||
| if worker_cmd: | ||
| test_cmd = f'{worker_cmd} && {test_cmd} ' | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,11 +2,16 @@ subinclude("///e2e//build_defs:e2e") | |
|
|
||
| _please_repo_e2e_test = please_repo_e2e_test | ||
|
|
||
| def please_repo_e2e_test(name, expected_output=None, plz_command, repo, labels=[]): | ||
| def please_repo_e2e_test(name, expected_output=None, plz_command, repo, labels=[], expect_output_contains=None): | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The upstream already has a
Either way, I think you should implement this as part of the upstream rule in https://github.com/please-build/plugin-integration-testing/blob/master/build_defs/e2e.build_defs so that other plugins can benefit from this change. aside: can you spot the bug in https://github.com/please-build/plugin-integration-testing/blob/master/build_defs/e2e.build_defs#L89 |
||
| plz_cmd = plz_command.replace("plz ", "plz -o please.PluginRepo:file://$TMP_DIR/$DATA_PLUGIN_REPO -o plugin.go.gotool:$TOOLS_GO -o plugin.go.pleasegotool:$TOOLS_PLEASE_GO ") | ||
| # Persist command output so subsequent assertions can inspect it while keeping the original exit code. | ||
| wrapped_plz_command = f"( {plz_cmd} >output 2>&1 ); STATUS=$?; cat output; exit $STATUS" | ||
|
|
||
| return _please_repo_e2e_test( | ||
| name = name, | ||
| expected_output = expected_output, | ||
| plz_command = plz_command.replace("plz ", "plz -o please.PluginRepo:file://$TMP_DIR/$DATA_PLUGIN_REPO -o plugin.go.gotool:$TOOLS_GO -o plugin.go.pleasegotool:$TOOLS_PLEASE_GO "), | ||
| expect_output_contains = expect_output_contains, | ||
| plz_command = wrapped_plz_command, | ||
| repo = repo, | ||
| data = { | ||
| "PLUGIN_REPO": ["//test:export"], | ||
|
|
||
| Original file line number | Diff line number | Diff line change | ||
|---|---|---|---|---|
| @@ -0,0 +1,8 @@ | ||||
| [Parse] | ||||
| BuildFileName = BUILD_FILE | ||||
| BuildFileName = BUILD | ||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||
| PreloadSubincludes = ///go//build_defs:go | ||||
|
|
||||
| [Plugin "go"] | ||||
| Target = //plugins:go | ||||
| Stdlib = //third_party/go:std | ||||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| plugin_repo( | ||
| name = "go", | ||
| revision = "master", | ||
| ) |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| go_test( | ||
| name = "testing_flag_test", | ||
| srcs = ["testing_flag_test.go"], | ||
| ) |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| package sample | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "testing" | ||
| ) | ||
|
|
||
| func TestTestingFlag(t *testing.T) { | ||
| fmt.Printf("testing.Testing() = %v\n", testing.Testing()) | ||
| if !testing.Testing() { | ||
| t.Fatalf("expected testing.Testing() to be true") | ||
| } | ||
| } |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| go_stdlib( | ||
| name = "std", | ||
| ) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This can be simplified