undo taint test changes

This commit is contained in:
Megan Bang 2022-08-29 11:21:06 -05:00
parent 00cc1ea26d
commit 40263cd861
2 changed files with 3 additions and 9 deletions

View File

@ -434,7 +434,6 @@ func (m *Meta) backendMigrateState_s_s(opts *backendMigrateOpts) error {
// includes preserving any lineage/serial information where possible, if
// both managers support such metadata.
log.Print("[TRACE] backendMigrateState: migration confirmed, so migrating")
if err := statemgr.Migrate(destinationState, sourceState); err != nil {
return fmt.Errorf(strings.TrimSpace(errBackendStateCopy),
opts.SourceType, opts.DestinationType, err)

View File

@ -1,8 +1,8 @@
package command
import (
"github.com/google/go-cmp/cmp"
"os"
"regexp"
"strings"
"testing"
@ -381,13 +381,8 @@ Resource instance test_instance.bar was not found, but this is not an error
because -allow-missing was set.
`)
re, err := regexp.Compile(expected)
if err != nil {
t.Fatalf("Error compiling regexp: %s", err)
}
if !re.MatchString(actual) {
t.Fatalf("wrong output\n expected: %s \n actual: %s", expected, actual)
if diff := cmp.Diff(expected, actual); diff != "" {
t.Fatalf("wrong output\n%s", diff)
}
}