Index: lnt/trunk/lnt/server/ui/views.py =================================================================== --- lnt/trunk/lnt/server/ui/views.py +++ lnt/trunk/lnt/server/ui/views.py @@ -1370,7 +1370,7 @@ # Compute comparison results for each machine. row.extend((runinfo.get_run_comparison_result( run, baseline, test_id, field, - ts.Sample.get_hash_of_Binary_field), + ts.Sample.get_hash_of_binary_field), run.id) for baseline, run in machine_run_info) Index: lnt/trunk/lnt/tests/nt.py =================================================================== --- lnt/trunk/lnt/tests/nt.py +++ lnt/trunk/lnt/tests/nt.py @@ -1397,7 +1397,6 @@ if server_reply.get('error', None): logger.warning("Server returned an error:" + server_reply['error']) fatal("No Server results. Cannot do reruns.") - logging.fatal() # Holds the combined local and server results. collated_results = dict() Index: lnt/trunk/lnt/util/ServerUtil.py =================================================================== --- lnt/trunk/lnt/util/ServerUtil.py +++ lnt/trunk/lnt/util/ServerUtil.py @@ -66,8 +66,6 @@ print "error:", result_data return - return reply - def submitFileToInstance(path, file, select_machine=None, merge_run=None): # Otherwise, assume it is a local url and submit to the default database