Display runtime for test cases

master
Richard Meadows 2015-06-28 22:39:18 +01:00
rodzic f58cc8f417
commit c1c5d8b4eb
1 zmienionych plików z 11 dodań i 11 usunięć

Wyświetl plik

@ -12,6 +12,7 @@ import sys
import importlib import importlib
from time import * from time import *
from colorama import * from colorama import *
import arrow
sys.path.append("./test") sys.path.append("./test")
import tc import tc
@ -59,7 +60,7 @@ class Tests():
self.printf("") self.printf("")
self.printf(Fore.GREEN + " " + tc_name + " - PASS" \ self.printf(Fore.GREEN + " " + tc_name + " - PASS" \
+ (" " * offset) + "CLOCKS = " + str(time) + Fore.RESET) + (" " * offset) + "CLOCK " + str(time) + Fore.RESET)
def print_fail(self, tc_name, time): def print_fail(self, tc_name, time):
"""Evil red pass notice""" """Evil red pass notice"""
@ -67,7 +68,7 @@ class Tests():
self.printf("") self.printf("")
self.printf(Fore.RED + " p " + tc_name + "- FAIL" \ self.printf(Fore.RED + " p " + tc_name + "- FAIL" \
+ (" " * offset) + "CLOCKS = " + str(time) + Fore.RESET) + (" " * offset) + "CLOCK " + str(time) + Fore.RESET)
def print_summary(self, results): def print_summary(self, results):
passes = 0 passes = 0
@ -125,11 +126,6 @@ class Tests():
else: else:
return None return None
def hw_get_last_time(self):
"""Returns the number of clocks the last test case took"""
return 1
#### Read / Write #### Read / Write
def read_variable(self, name): def read_variable(self, name):
@ -145,7 +141,9 @@ class Tests():
tc_name = test_case.__class__.__name__ tc_name = test_case.__class__.__name__
self.print_header(tc_name) self.print_header(tc_name)
fail = False fail = False
ttime = 0
start = arrow.now()
if hasattr(test_case, 'iterations'): if hasattr(test_case, 'iterations'):
"""This is for test cases that need to be run multiple time to check """This is for test cases that need to be run multiple time to check
the result is always correct the result is always correct
@ -154,7 +152,7 @@ class Tests():
for i in range(test_case.iterations): for i in range(test_case.iterations):
params = test_case.get_test() params = test_case.get_test()
result = self.hw_run_tc(tc_name, params) result = self.hw_run_tc(tc_name, params)
ttime += self.hw_get_last_time()
if result: if result:
if not test_case.is_correct(params, result, self.print_info): if not test_case.is_correct(params, result, self.print_info):
fail = True fail = True
@ -169,7 +167,7 @@ class Tests():
params = test_case.get_test() params = test_case.get_test()
while (params): while (params):
result = self.hw_run_tc(tc_name, params) result = self.hw_run_tc(tc_name, params)
ttime += self.hw_get_last_time()
if result: if result:
if not test_case.is_correct(params, result, self.print_info): if not test_case.is_correct(params, result, self.print_info):
fail = True fail = True
@ -177,7 +175,9 @@ class Tests():
else: # No result, Failure else: # No result, Failure
fail = True fail = True
params = test_case.get_test() # Calculate time taken
ttime = (arrow.now()-start)
if not fail: if not fail:
self.print_pass(tc_name, ttime) self.print_pass(tc_name, ttime)
else: else: