[LNT] r264722 - [search] default_machine should be an ID, not a textual name

[James Molloy via llvm-commits]

Author: jamesm
Date: Tue Mar 29 07:11:19 2016
New Revision: 264722

URL: http://llvm.org/viewvc/llvm-project?rev=264722&view=rev
Log:
[search] default_machine should be an ID, not a textual name

Modified:
    lnt/trunk/lnt/server/db/search.py
    lnt/trunk/tests/server/db/search.py

Modified: lnt/trunk/lnt/server/db/search.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/server/db/search.py?rev=264722&r1=264721&r2=264722&view=diff
==============================================================================
--- lnt/trunk/lnt/server/db/search.py (original)
+++ lnt/trunk/lnt/server/db/search.py Tue Mar 29 07:11:19 2016
@@ -27,10 +27,7 @@ def _naive_search_for_run(ts, query, num
         else:
             machine_queries.append(q)
 
-    # If we didn't have any machines queries but we do have a default, query that.
-    if not machine_queries and default_machine:
-        machine_queries = [default_machine]
-    elif not machine_queries:
+    if not machine_queries and not default_machine:
         # No machines to query: no matches. We can't query all machines, we'd end up
         # doing a full table scan and that is not scalable.
         return []
@@ -39,9 +36,13 @@ def _naive_search_for_run(ts, query, num
         order_queries.append(default_order)
 
     machines = []
-    for m in ts.query(ts.Machine).all():
-        if all(q in m.name for q in machine_queries):
-            machines.append(m.id)
+    if not machine_queries:
+        machines = [default_machine]
+    else:
+        for m in ts.query(ts.Machine).all():
+            if all(q in m.name for q in machine_queries):
+                machines.append(m.id)
+
     if not machines:
         return []
 
@@ -66,4 +67,4 @@ def search(ts, query,
     """
 
     return _naive_search_for_run(ts, query,
-    num_results, default_machine, default_order)
+                                 num_results, default_machine, default_order)

Modified: lnt/trunk/tests/server/db/search.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/tests/server/db/search.py?rev=264722&r1=264721&r2=264722&view=diff
==============================================================================
--- lnt/trunk/tests/server/db/search.py (original)
+++ lnt/trunk/tests/server/db/search.py Tue Mar 29 07:11:19 2016
@@ -93,7 +93,7 @@ class SearchTest(unittest.TestCase):
     def test_default_machine(self):
         ts = self.db.testsuite.get('nts')
 
-        results = self._mangleResults(search(ts, '65', default_machine='machine2'))
+        results = self._mangleResults(search(ts, '65', default_machine=3))
         self.assertEqual(results, [
             ('machine2', '6512')
         ])