[LNT] r315391 - api.py: Fix machine specification by name code

[Matthias Braun via llvm-commits]

Author: matze
Date: Tue Oct 10 16:52:04 2017
New Revision: 315391

URL: http://llvm.org/viewvc/llvm-project?rev=315391&view=rev
Log:
api.py: Fix machine specification by name code

Modified:
    lnt/trunk/lnt/server/ui/api.py
    lnt/trunk/tests/server/ui/test_api.py

Modified: lnt/trunk/lnt/server/ui/api.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/server/ui/api.py?rev=315391&r1=315390&r2=315391&view=diff
==============================================================================
--- lnt/trunk/lnt/server/ui/api.py (original)
+++ lnt/trunk/lnt/server/ui/api.py Tue Oct 10 16:52:04 2017
@@ -97,6 +97,8 @@ class Machine(Resource):
             elif len(machines) > 1:
                 abort(404, msg="Name '%s' is ambiguous; specify machine id" %
                       (machine_spec))
+            else:
+                machine = machines[0]
         if machine is None:
             abort(404, msg="Did not find machine '%s'" % (machine_spec,))
         return machine

Modified: lnt/trunk/tests/server/ui/test_api.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/tests/server/ui/test_api.py?rev=315391&r1=315390&r2=315391&view=diff
==============================================================================
--- lnt/trunk/tests/server/ui/test_api.py (original)
+++ lnt/trunk/tests/server/ui/test_api.py Tue Oct 10 16:52:04 2017
@@ -155,6 +155,11 @@ class JSONAPITester(unittest.TestCase):
         for run in j['runs']:
             self.assertSetEqual(set(run.keys()), possible_run_keys)
 
+        # Specify machine by name
+        j = check_json(client, 'api/db_default/v4/nts/machines/localhost__clang_DEV__x86_64')
+        self._check_response_is_well_formed(j)
+        self.assertEqual(j['machine'], machines_expected_response[0])
+
         # Invalid machine ids are 404.
         check_json(client, 'api/db_default/v4/nts/machines/99', expected_code=404)
         check_json(client, 'api/db_default/v4/nts/machines/foo', expected_code=404)