[llvm-commits] [LNT] r165424 - in /lnt/trunk/lnt/server: reporting/summaryreport.py ui/views.py

[Michael Gottesman]

Author: mgottesman
Date: Mon Oct  8 15:30:00 2012
New Revision: 165424

URL: http://llvm.org/viewvc/llvm-project?rev=165424&view=rev
Log:
[summaryreport] Remove machines to merge since it is no longer needed.

Modified:
    lnt/trunk/lnt/server/reporting/summaryreport.py
    lnt/trunk/lnt/server/ui/views.py

Modified: lnt/trunk/lnt/server/reporting/summaryreport.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/server/reporting/summaryreport.py?rev=165424&r1=165423&r2=165424&view=diff
==============================================================================
--- lnt/trunk/lnt/server/reporting/summaryreport.py (original)
+++ lnt/trunk/lnt/server/reporting/summaryreport.py Mon Oct  8 15:30:00 2012
@@ -84,7 +84,7 @@
 
 class SummaryReport(object):
     def __init__(self, db, report_orders, report_machine_names,
-                 report_machine_patterns, machines_to_merge):
+                 report_machine_patterns):
         self.db = db
         self.testsuites = list(db.testsuite.values())
         self.report_orders = list((name,orders)
@@ -94,7 +94,6 @@
         self.report_machine_rexes = [
             re.compile(pattern)
             for pattern in self.report_machine_patterns]
-        self.machines_to_merge = dict(machines_to_merge)
 
         self.data_table = None
         self.requested_machine_ids = None
@@ -189,9 +188,6 @@
             machine_id = run_machine_id_map[run_id]
             run_parameters = run_parameters_map[run_id]
 
-            # Convert the machine ID.
-            machine_id = self.machines_to_merge.get(machine_id, machine_id)
-
             # Get the test.
             test = ts_tests[sample[1]]
 
@@ -236,9 +232,6 @@
             machine_id = run_machine_id_map[run_id]
             run_parameters = run_parameters_map[run_id]
 
-            # Convert the machine ID.
-            machine_id = self.machines_to_merge.get(machine_id, machine_id)
-
             # Get the test.
             test = ts_tests[sample[1]]
 

Modified: lnt/trunk/lnt/server/ui/views.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/server/ui/views.py?rev=165424&r1=165423&r2=165424&view=diff
==============================================================================
--- lnt/trunk/lnt/server/ui/views.py (original)
+++ lnt/trunk/lnt/server/ui/views.py Mon Oct  8 15:30:00 2012
@@ -841,7 +841,6 @@
             "machine_names" : [],
             "orders" : [],
             "machine_patterns" : [],
-            "machines_to_merge" : {}
             }
 
     # Get the list of available test suites.
@@ -881,10 +880,7 @@
     # Create the report object.
     report = lnt.server.reporting.summaryreport.SummaryReport(
         request.get_db(), config['orders'], config['machine_names'],
-        config['machine_patterns'],
-        dict((int(key),value)
-             for key,value in config['machines_to_merge'].items()))
-
+        config['machine_patterns'])
     # Build the report.
     report.build()