From a4dc12f12c7a06f5e28d5b1e760249875ef7a8c5 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Wed, 31 Dec 2014 11:21:39 +0100
Subject: [PATCH] Additional comments and added name to error output
---
tests/vm/gh_test.go | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/tests/vm/gh_test.go b/tests/vm/gh_test.go
index e06b0ed82..f1e4d1acc 100644
--- a/tests/vm/gh_test.go
+++ b/tests/vm/gh_test.go
@@ -108,17 +108,16 @@ func RunVmTest(p string, t *testing.T) {
)
isVmTest := len(test.Exec) > 0
-
if isVmTest {
ret, logs, gas, err = helper.RunVm(statedb, env, test.Exec)
} else {
ret, logs, gas, err = helper.RunState(statedb, env, test.Transaction)
}
- // When an error is returned it doesn't always mean the tests fails.
- // Have to come up with some conditional failing mechanism.
+ // Log the error if there is one. Error does not mean failing test.
+ // A test fails if err != nil and post params are specified in the test.
if err != nil {
- helper.Log.Infoln(err)
+ helper.Log.Infof("%s's: %v\n", name, err)
}
rexp := helper.FromHex(test.Out)
@@ -160,7 +159,6 @@ func RunVmTest(p string, t *testing.T) {
}
if len(test.Logs) > 0 {
- // Logs within the test itself aren't correct, missing empty fields (32 0s)
for i, log := range test.Logs {
genBloom := ethutil.LeftPadBytes(types.LogsBloom(state.Logs{logs[i]}).Bytes(), 64)
if !bytes.Equal(genBloom, ethutil.Hex2Bytes(log.BloomF)) {
--
GitLab