Skip to content

Commit

Permalink
test: Fix TestPantheonPush, broken due to php8.2 default (#5874) [ski…
Browse files Browse the repository at this point in the history
…p ci]
  • Loading branch information
rfay committed Feb 21, 2024
1 parent b1c32a9 commit 12da4ba
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions pkg/ddevapp/providerPantheon_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,8 @@ func TestPantheonPush(t *testing.T) {
err := globalconfig.WriteGlobalConfig(globalconfig.DdevGlobalConfig)
assert.NoError(err)

// Use a D9 codebase for Drush to work right
d9code := FullTestSites[8]
// Use a D10 codebase for Drush to work right
d9code := FullTestSites[12]
d9code.Name = t.Name()
err = globalconfig.RemoveProjectInfo(t.Name())
require.NoError(t, err)
Expand Down Expand Up @@ -175,7 +175,8 @@ func TestPantheonPush(t *testing.T) {
})

app.Name = t.Name()
app.Type = nodeps.AppTypeDrupal9
app.Type = nodeps.AppTypeDrupal10
app.PHPVersion = nodeps.PHP82
app.Hooks = map[string][]ddevapp.YAMLTask{"post-push": {{"exec-host": "touch hello-post-push-" + app.Name}}, "pre-push": {{"exec-host": "touch hello-pre-push-" + app.Name}}}
_ = app.Stop(true, false)

Expand Down Expand Up @@ -216,10 +217,10 @@ func TestPantheonPush(t *testing.T) {
require.NoError(t, err)

// Make sure we have Drush
_, _, err = app.Exec(&ddevapp.ExecOpts{
Cmd: "composer require --no-interaction drush/drush:* >/dev/null 2>/dev/null",
stdout, stderr, err := app.Exec(&ddevapp.ExecOpts{
Cmd: "composer require --no-interaction drush/drush >/dev/null 2>/dev/null",
})
require.NoError(t, err)
require.NoError(t, err, "failed to composer require drush err=%v stdout='%s', stderr='%s'", err, stdout, stderr)
err = app.MutagenSyncFlush()
assert.NoError(err)

Expand Down

0 comments on commit 12da4ba

Please sign in to comment.