maxmustermann/pulumi
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix merge conflict

Browse source
This commit is contained in:
Fraser Waters 2021-11-24 23:03:43 +00:00
parent 3bad3c4abf
commit 19dc1bf865
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkg/engine/lifeycletest/test_plan.go
View file

@ -238,15 +238,10 @@ func (p *TestPlan) Run(t *testing.T, snapshot *deploy.Snapshot) *deploy.Snapshot
snap := snapshot
for _, step := range p.Steps {
if !step.SkipPreview {
<<<<<<< HEAD
previewTarget := p.GetTarget(t, snap)
_, res := step.Op.Run(project, previewTarget, p.Options, true, p.BackendClient, step.Validate)
=======
previewSnap := CloneSnapshot(t, snap)
previewTarget := p.GetTarget(previewSnap)
previewTarget := p.GetTarget(t, previewSnap)
// Don't run validate on the preview step
_, res := step.Op.Run(project, previewTarget, p.Options, true, p.BackendClient, nil)
>>>>>>> origin/master
if step.ExpectFailure {
assertIsErrorOrBailResult(t, res)
continue