revert back to calling server for test plan

Author: jasonwbarnett

README.md

@@ -60,7 +60,7 @@ To configure the test runner for bktec, please refer to the detailed guides prov
 - [Playwright](./docs/playwright.md)
 - [Cypress](./docs/cypress.md)
 - [pytest](./docs/pytest.md)
-- [pytest pants](./docs/pytestpants.md)
+- [pytest pants](./docs/pytest-pants.md)
 - [go test](./docs/gotest.md)
 - [RSpec](./docs/rspec.md)
 

docs/pytestpants.md docs/pytest-pants.mddocs/pytestpants.md renamed to docs/pytest-pants.md

@@ -12,7 +12,7 @@
 > - Split slow files by individual test example
 > - Skip tests
 
-To integrate bktec with pants, you need to [install and configure Buildkite Test Collector for pytest](https://buildkite.com/docs/test-engine/python-collectors#pytest-collector) first. Then set the `BUILDKITE_TEST_ENGINE_TEST_RUNNER` environment variable to `pytestpants`.
+To integrate bktec with pants, you need to [install and configure Buildkite Test Collector for pytest](https://buildkite.com/docs/test-engine/python-collectors#pytest-collector) first. Then set the `BUILDKITE_TEST_ENGINE_TEST_RUNNER` environment variable to `pytest-pants`.
 
 Look at the example configuration files in the [pytest_pants testdata directory](../internal/runner/testdata/pytest_pants) for an example of how to add buildkite-test-collector to the pants resolve used by pytest. Specifically:
 
@@ -29,7 +29,7 @@ pants generate-lockfiles --resolve=pytest
 Only running `pants test` with `python_test` targets is supported at this time.
 
 ```sh
-export BUILDKITE_TEST_ENGINE_TEST_RUNNER=pytestpants
+export BUILDKITE_TEST_ENGINE_TEST_RUNNER=pytest-pants
 export BUILDKITE_TEST_ENGINE_TEST_CMD="pants --filter-target-type=python_test --changed-since=HEAD~1 test -- --json={{resultPath}} --merge-json"
 bktec
 ```

internal/config/validate.go

@@ -60,7 +60,7 @@ func (c *Config) validate() error {
 		c.errs.appendFieldError("BUILDKITE_TEST_ENGINE_SUITE_SLUG", "must not be blank")
 	}
 
-	if c.ResultPath == "" && c.TestRunner != "cypress" && c.TestRunner != "pytest" && c.TestRunner != "pytestpants" {
+	if c.ResultPath == "" && c.TestRunner != "cypress" && c.TestRunner != "pytest" && c.TestRunner != "pytest-pants" {
 		c.errs.appendFieldError("BUILDKITE_TEST_ENGINE_RESULT_PATH", "must not be blank")
 	}
 

internal/runner/detector.go

@@ -47,12 +47,12 @@ func DetectRunner(cfg config.Config) (TestRunner, error) {
 		return NewPlaywright(runnerConfig), nil
 	case "pytest":
 		return NewPytest(runnerConfig), nil
-	case "pytestpants":
+	case "pytest-pants":
 		return NewPytestPants(runnerConfig), nil
 	case "gotest":
 		return NewGoTest(runnerConfig), nil
 	default:
 		// Update the error message to include the new runner
-		return nil, errors.New("runner value is invalid, possible values are 'rspec', 'jest', 'cypress', 'playwright', 'pytest', 'pytestpants', or 'gotest'")
+		return nil, errors.New("runner value is invalid, possible values are 'rspec', 'jest', 'cypress', 'playwright', 'pytest', 'pytest-pants', or 'gotest'")
 	}
 }

internal/runner/pytest_pants.go

@@ -16,7 +16,7 @@ type PytestPants struct {
 }
 
 func (p PytestPants) Name() string {
-	return "pytest"
+	return "pytest-pants"
 }
 
 func NewPytestPants(c RunnerConfig) PytestPants {

main.go

@@ -361,25 +361,19 @@ func fetchOrCreateTestPlan(ctx context.Context, apiClient *api.Client, cfg confi
 		return handleError(err)
 	}
 
-	var testPlan plan.TestPlan
-	if params.Runner != "pytestpants" {
-		debug.Println("Creating test plan")
-		createdPlan, err := apiClient.CreateTestPlan(ctx, cfg.SuiteSlug, params)
+	debug.Println("Creating test plan")
+	testPlan, err := apiClient.CreateTestPlan(ctx, cfg.SuiteSlug, params)
 
-		if err != nil {
-			return handleError(err)
-		}
+	if err != nil {
+		return handleError(err)
+	}
 
-		// The server can return an "error" plan indicated by an empty task list (i.e. `{"tasks": {}}`).
-		// In this case, we should create a fallback plan.
-		if len(createdPlan.Tasks) == 0 {
-			fmt.Println("⚠️ Error plan received, falling back to non-intelligent splitting. Your build may take longer than usual.")
-			testPlan = plan.CreateFallbackPlan(files, cfg.Parallelism)
-		} else {
-			testPlan = createdPlan
-		}
-	} else {
+	// The server can return an "error" plan indicated by an empty task list (i.e. `{"tasks": {}}`).
+	// In this case, we should create a fallback plan.
+	if len(testPlan.Tasks) == 0 {
+		fmt.Println("⚠️ Error plan received, falling back to non-intelligent splitting. Your build may take longer than usual.")
 		testPlan = plan.CreateFallbackPlan(files, cfg.Parallelism)
+		return testPlan, nil
 	}
 
 	debug.Printf("Test plan created. Identifier: %q", cfg.Identifier)
@@ -399,15 +393,21 @@ func createRequestParam(ctx context.Context, cfg config.Config, files []string,
 
 	// Splitting files by example is only supported for rspec runner.
 	if runner.Name() != "RSpec" {
-		return api.TestPlanParams{
+		params := api.TestPlanParams{
 			Identifier:  cfg.Identifier,
 			Parallelism: cfg.Parallelism,
 			Branch:      cfg.Branch,
 			Runner:      cfg.TestRunner,
 			Tests: api.TestPlanParamsTest{
 				Files: testFiles,
 			},
-		}, nil
+		}
+
+		if cfg.TestRunner == "pytest-pants" {
+			params.Runner = "pytest"
+		}
+
+		return params, nil
 	}
 
 	if cfg.SplitByExample {