Unskip working blocktests following ethash cache reusage

Gustav Simonsson · Gustav Simonsson · commit f4341c7b7f5d · 2015-05-05T08:34:29.000+02:00
diff --git a/tests/block_test.go b/tests/block_test.go
@@ -13,42 +13,37 @@ import (
 
 // TODO: refactor test setup & execution to better align with vm and tx tests
 func TestBcValidBlockTests(t *testing.T) {
-	t.Skip("Skipped in lieu of performance fixes.")
 	runBlockTestsInFile("files/BlockTests/bcValidBlockTest.json", []string{}, t)
 }
 
 func TestBcUncleTests(t *testing.T) {
-	t.Skip("Skipped in lieu of performance fixes.")
+	t.Skip("Skipped until https://github.com/ethereum/go-ethereum/pull/857 is merged.")
 	runBlockTestsInFile("files/BlockTests/bcUncleTest.json", []string{}, t)
 }
 
 func TestBcUncleHeaderValidityTests(t *testing.T) {
-	t.Skip("Skipped in lieu of performance fixes.")
+	t.Skip("Skipped until https://github.com/ethereum/go-ethereum/pull/857 is merged.")
 	runBlockTestsInFile("files/BlockTests/bcUncleHeaderValiditiy.json", []string{}, t)
 }
 
 func TestBcInvalidHeaderTests(t *testing.T) {
-	t.Skip("Skipped in lieu of performance fixes.")
 	runBlockTestsInFile("files/BlockTests/bcInvalidHeaderTest.json", []string{}, t)
 }
 
 func TestBcInvalidRLPTests(t *testing.T) {
-	t.Skip("Skipped in lieu of performance fixes.")
 	runBlockTestsInFile("files/BlockTests/bcInvalidRLPTest.json", []string{}, t)
 }
 
 func TestBcJSAPITests(t *testing.T) {
-	t.Skip("Skipped in lieu of performance fixes.")
 	runBlockTestsInFile("files/BlockTests/bcJS_API_Test.json", []string{}, t)
 }
 
 func TestBcRPCAPITests(t *testing.T) {
-	t.Skip("Skipped in lieu of performance fixes.")
+	t.Skip("Skipped until https://github.com/ethereum/go-ethereum/pull/857 is merged.")
 	runBlockTestsInFile("files/BlockTests/bcRPC_API_Test.json", []string{}, t)
 }
 
 func TestBcForkBlockTests(t *testing.T) {
-	t.Skip("Skipped in lieu of performance fixes.")
 	runBlockTestsInFile("files/BlockTests/bcForkBlockTest.json", []string{}, t)
 }
 
@@ -71,7 +66,6 @@ func runBlockTestsInFile(filepath string, snafus []string, t *testing.T) {
 }
 
 func runBlockTest(name string, test *BlockTest, t *testing.T) {
-	t.Log("Running test: ", name)
 	cfg := testEthConfig()
 	ethereum, err := eth.New(cfg)
 	if err != nil {
@@ -100,7 +94,7 @@ func runBlockTest(name string, test *BlockTest, t *testing.T) {
 	if err = test.ValidatePostState(statedb); err != nil {
 		t.Fatal("post state validation failed: %v", err)
 	}
-	t.Log("Test passed:  ", name)
+	t.Log("Test passed: ", name)
 }
 
 func testEthConfig() *eth.Config {

Original file line number	Diff line number	Diff line change
`@@ -13,42 +13,37 @@ import (`
`13`	`13`
`14`	`14`	`// TODO: refactor test setup & execution to better align with vm and tx tests`
`15`	`15`	`func TestBcValidBlockTests(t *testing.T) {`
`16`		`- t.Skip("Skipped in lieu of performance fixes.")`
`17`	`16`	`runBlockTestsInFile("files/BlockTests/bcValidBlockTest.json", []string{}, t)`
`18`	`17`	`}`
`19`	`18`
`20`	`19`	`func TestBcUncleTests(t *testing.T) {`
`21`		`- t.Skip("Skipped in lieu of performance fixes.")`
	`20`	`+ t.Skip("Skipped until https://github.com/ethereum/go-ethereum/pull/857 is merged.")`
`22`	`21`	`runBlockTestsInFile("files/BlockTests/bcUncleTest.json", []string{}, t)`
`23`	`22`	`}`
`24`	`23`
`25`	`24`	`func TestBcUncleHeaderValidityTests(t *testing.T) {`
`26`		`- t.Skip("Skipped in lieu of performance fixes.")`
	`25`	`+ t.Skip("Skipped until https://github.com/ethereum/go-ethereum/pull/857 is merged.")`
`27`	`26`	`runBlockTestsInFile("files/BlockTests/bcUncleHeaderValiditiy.json", []string{}, t)`
`28`	`27`	`}`
`29`	`28`
`30`	`29`	`func TestBcInvalidHeaderTests(t *testing.T) {`
`31`		`- t.Skip("Skipped in lieu of performance fixes.")`
`32`	`30`	`runBlockTestsInFile("files/BlockTests/bcInvalidHeaderTest.json", []string{}, t)`
`33`	`31`	`}`
`34`	`32`
`35`	`33`	`func TestBcInvalidRLPTests(t *testing.T) {`
`36`		`- t.Skip("Skipped in lieu of performance fixes.")`
`37`	`34`	`runBlockTestsInFile("files/BlockTests/bcInvalidRLPTest.json", []string{}, t)`
`38`	`35`	`}`
`39`	`36`
`40`	`37`	`func TestBcJSAPITests(t *testing.T) {`
`41`		`- t.Skip("Skipped in lieu of performance fixes.")`
`42`	`38`	`runBlockTestsInFile("files/BlockTests/bcJS_API_Test.json", []string{}, t)`
`43`	`39`	`}`
`44`	`40`
`45`	`41`	`func TestBcRPCAPITests(t *testing.T) {`
`46`		`- t.Skip("Skipped in lieu of performance fixes.")`
	`42`	`+ t.Skip("Skipped until https://github.com/ethereum/go-ethereum/pull/857 is merged.")`
`47`	`43`	`runBlockTestsInFile("files/BlockTests/bcRPC_API_Test.json", []string{}, t)`
`48`	`44`	`}`
`49`	`45`
`50`	`46`	`func TestBcForkBlockTests(t *testing.T) {`
`51`		`- t.Skip("Skipped in lieu of performance fixes.")`
`52`	`47`	`runBlockTestsInFile("files/BlockTests/bcForkBlockTest.json", []string{}, t)`
`53`	`48`	`}`
`54`	`49`
`@@ -71,7 +66,6 @@ func runBlockTestsInFile(filepath string, snafus []string, t *testing.T) {`
`71`	`66`	`}`
`72`	`67`
`73`	`68`	`func runBlockTest(name string, test BlockTest, t testing.T) {`
`74`		`- t.Log("Running test: ", name)`
`75`	`69`	`cfg := testEthConfig()`
`76`	`70`	`ethereum, err := eth.New(cfg)`
`77`	`71`	`if err != nil {`
`@@ -100,7 +94,7 @@ func runBlockTest(name string, test BlockTest, t testing.T) {`
`100`	`94`	`if err = test.ValidatePostState(statedb); err != nil {`
`101`	`95`	`t.Fatal("post state validation failed: %v", err)`
`102`	`96`	`}`
`103`		`- t.Log("Test passed: ", name)`
	`97`	`+ t.Log("Test passed: ", name)`
`104`	`98`	`}`
`105`	`99`
`106`	`100`	`func testEthConfig() *eth.Config {`