Skip to content

simulator: fix a free varialbe assignment #149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 28, 2018
Merged

simulator: fix a free varialbe assignment #149

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 19 additions & 20 deletions simulators/ethereum/consensus/hivemodel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,16 @@ def _startNodeAndRunTestWrapped(self, testcase):
print(str(e))
print(traceback.format_exc())


def reportTest(self, tc, start, nodeId = "NA"):
tc.setTimeElapsed(1000 * ( time.time() - start))
self.hive.log("Test: %s %s (%s)" % (tc.testfile, tc, tc.status()))
self.hive.subresult(nodeId,
tc.fullname(),
tc.wasSuccessfull(),
tc.topLevelError(),
tc.details()
)
def _startNodeAndRunTest(self, testcase):
start = time.time()
try:
Expand Down Expand Up @@ -232,19 +242,6 @@ def _startNodeAndRunTest(self, testcase):

self.hive.log("Starting client node for test %s" % testcase)


def reportTest(tc):
tc.setTimeElapsed(1000 * ( time.time() - start))
self.hive.log("Test: %s %s (%s)" % (tc.testfile, tc, tc.status()))
self.hive.subresult(
node.nodeId,
testcase.fullname(),
testcase.wasSuccessfull(),
testcase.topLevelError(),
testcase.details()
)


try:
node = self.hive.newNode(params)
except Exception, startNodeError:
Expand All @@ -253,21 +250,23 @@ def reportTest(tc):
except Exception, e:
error = str(startNodeError)
testcase.fail(["Failed to start client node", traceback.format_exc()])
reportTest(testcase)
self.reportTest(testcase, start)
return

self.executeTestcase(testcase, node)
reportTest(testcase)
self.reportTest(testcase, start, nodeId = node.nodeId)

try:
self.hive.killNode(node)
except Exception, killNodeError:
try:
error = traceback.format_exc()
except Exception, e:
error = str(killNodeError)
# Clients are sometimes already killed by timeouts
pass
#try:
# error = traceback.format_exc()
#except Exception, e:
# error = str(killNodeError)

self.hive.log("Failed to kill node %s: %s" % (node, error))
#self.hive.log("Failed to kill node %s: %s" % (node, error))

def _performTests(self, start=0, end=-1, whitelist=[], blacklist=[]):
pool = ThreadPool(PARALLEL_TESTS)
Expand Down