[LNT] r234800 - When machine is invalid, return 404 instead of error

[Chris Matthews]

Author: cmatthews
Date: Mon Apr 13 16:46:26 2015
New Revision: 234800

URL: http://llvm.org/viewvc/llvm-project?rev=234800&view=rev
Log:
When machine is invalid, return 404 instead of error

Modified:
    lnt/trunk/lnt/server/ui/views.py
    lnt/trunk/tests/server/ui/V4Pages.py

Modified: lnt/trunk/lnt/server/ui/views.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/server/ui/views.py?rev=234800&r1=234799&r2=234800&view=diff
==============================================================================
--- lnt/trunk/lnt/server/ui/views.py (original)
+++ lnt/trunk/lnt/server/ui/views.py Mon Apr 13 16:46:26 2015
@@ -185,11 +185,12 @@ def v4_machine(id):
                 json_obj['runs'].append((run.id, rev,
                                          run.start_time.isoformat(), run.end_time.isoformat()))
         return flask.jsonify(**json_obj)
-
-    return render_template("v4_machine.html",
+    try:
+        return render_template("v4_machine.html",
                            testsuite_name=g.testsuite_name, id=id,
                            associated_runs=associated_runs)
-
+    except sqlalchemy.orm.exc.NoResultFound as e:
+        abort(404)
 class V4RequestInfo(object):
     def __init__(self, run_id, only_html_body=True):
         self.db = request.get_db()

Modified: lnt/trunk/tests/server/ui/V4Pages.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/tests/server/ui/V4Pages.py?rev=234800&r1=234799&r2=234800&view=diff
==============================================================================
--- lnt/trunk/tests/server/ui/V4Pages.py (original)
+++ lnt/trunk/tests/server/ui/V4Pages.py Mon Apr 13 16:46:26 2015
@@ -38,6 +38,8 @@ def main():
     # Get a machine overview page.
     check_code(client, '/v4/nts/machine/1')
 
+    # Check invalid machine gives error.
+    check_code(client,  '/v4/nts/machine/1000', expected_code=404)
     # Get a machine overview page in JSON format.
     check_code(client, '/v4/nts/machine/1?json=true')