Rebase to fix test, and restore test to original form

gammazero · gammazero · commit 66db9a1e66b3 · 2021-04-15T08:34:24.000-07:00
diff --git a/test/sharness/t0066-migration.sh b/test/sharness/t0066-migration.sh
@@ -46,7 +46,7 @@ test_expect_success "output looks good" '
 #
 # If run with real migrations, the daemon continues running and must be killed.
 test_expect_success "ipfs daemon --migrate=true runs migration" '
-  test_expect_code 1 ipfs daemon --migrate=true > true_out 2>&1
+  test_expect_code 1 ipfs daemon --migrate=true > true_out
 '
 
 test_expect_success "output looks good" '

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ test_expect_success "output looks good" '`
`46`	`46`	`#`
`47`	`47`	`# If run with real migrations, the daemon continues running and must be killed.`
`48`	`48`	`test_expect_success "ipfs daemon --migrate=true runs migration" '`
`49`		`- test_expect_code 1 ipfs daemon --migrate=true > true_out 2>&1`
	`49`	`+ test_expect_code 1 ipfs daemon --migrate=true > true_out`
`50`	`50`	`'`
`51`	`51`
`52`	`52`	`test_expect_success "output looks good" '`