[LNT] r312588 - Further fixes for fieldchange.

[Matthias Braun via llvm-commits]

Author: matze
Date: Tue Sep  5 15:51:59 2017
New Revision: 312588

URL: http://llvm.org/viewvc/llvm-project?rev=312588&view=rev
Log:
Further fixes for fieldchange.

Turns out we have not enough tests for the fieldchange logic so I
accidentally broke some of it in r312363.

Modified:
    lnt/trunk/lnt/server/db/fieldchange.py
    lnt/trunk/lnt/util/async_ops.py

Modified: lnt/trunk/lnt/server/db/fieldchange.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/server/db/fieldchange.py?rev=312588&r1=312587&r2=312588&view=diff
==============================================================================
--- lnt/trunk/lnt/server/db/fieldchange.py (original)
+++ lnt/trunk/lnt/server/db/fieldchange.py Tue Sep  5 15:51:59 2017
@@ -16,7 +16,7 @@ FIELD_CHANGE_LOOKBACK = 10
 
 
 def post_submit_tasks(session, ts, run_id):
-    regenerate_fieldchanges_for_run(ts, session, run_id)
+    regenerate_fieldchanges_for_run(session, ts, run_id)
 
 
 def delete_fieldchange(session, ts, change):
@@ -55,7 +55,7 @@ def delete_fieldchange(session, ts, chan
 
 
 @timed
-def regenerate_fieldchanges_for_run(ts, session, run_id):
+def regenerate_fieldchanges_for_run(session, ts, run_id):
     """Regenerate the set of FieldChange objects for the given run.
     """
     # Allow for potentially a few different runs, previous_runs, next_runs
@@ -129,6 +129,7 @@ def regenerate_fieldchanges_for_run(ts,
                                    machine=run.machine,
                                    test=test,
                                    field_id=field.id)
+                f.field = field
                 # Check the rules to see if this change matters.
                 if rules.is_useful_change(session, ts, f):
                     session.add(f)

Modified: lnt/trunk/lnt/util/async_ops.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/util/async_ops.py?rev=312588&r1=312587&r2=312588&view=diff
==============================================================================
--- lnt/trunk/lnt/util/async_ops.py (original)
+++ lnt/trunk/lnt/util/async_ops.py Tue Sep  5 15:51:59 2017
@@ -134,7 +134,7 @@ def async_wrapper(job, ts_args, func_arg
         with contextlib.closing(db):
             session = db.make_session()
             ts = db.testsuite[ts_args['tsname']]
-            nothing = job(ts, session, **func_args)
+            nothing = job(session, ts, **func_args)
             assert nothing is None
             session.close()
         end_time = time.time()