[LNT] r312658 - Remove sys.exit() from code paths used for the server

[Matthias Braun via llvm-commits]

Author: matze
Date: Wed Sep  6 11:22:23 2017
New Revision: 312658

URL: http://llvm.org/viewvc/llvm-project?rev=312658&view=rev
Log:
Remove sys.exit() from code paths used for the server

It's nicer to throw an exception to give code a chance to cleanup.

Modified:
    lnt/trunk/lnt/server/db/v4db.py
    lnt/trunk/lnt/server/instance.py
    lnt/trunk/lnt/server/reporting/analysis.py

Modified: lnt/trunk/lnt/server/db/v4db.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/server/db/v4db.py?rev=312658&r1=312657&r2=312658&view=diff
==============================================================================
--- lnt/trunk/lnt/server/db/v4db.py (original)
+++ lnt/trunk/lnt/server/db/v4db.py Wed Sep  6 11:22:23 2017
@@ -1,4 +1,3 @@
-from lnt.testing.util.commands import fatal
 import glob
 import yaml
 import sys
@@ -45,10 +44,7 @@ class V4DB(object):
         # Load schema files (preferred)
         schemasDir = self.config.schemasDir
         for schema_file in glob.glob('%s/*.yaml' % schemasDir):
-            try:
-                self._load_schema_file(schema_file)
-            except Exception as e:
-                fatal("Could not load schema '%s': %s\n" % (schema_file, e))
+            self._load_schema_file(schema_file)
 
         # Load schemas from database.
         session = self.make_session()

Modified: lnt/trunk/lnt/server/instance.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/server/instance.py?rev=312658&r1=312657&r2=312658&view=diff
==============================================================================
--- lnt/trunk/lnt/server/instance.py (original)
+++ lnt/trunk/lnt/server/instance.py Wed Sep  6 11:22:23 2017
@@ -2,11 +2,8 @@ import os
 import shutil
 import tarfile
 import tempfile
-
 import lnt.server.config
-
 from lnt.util import logger
-from lnt.testing.util.commands import fatal
 
 
 class Instance(object):
@@ -47,13 +44,14 @@ class Instance(object):
             else:
                 filenames = os.listdir(tmpdir)
                 if len(filenames) != 1:
-                    fatal("unable to find LNT instance inside tarfile")
+                    raise Exception("Unable to find LNT instance "
+                                    "inside tarfile")
                 config_path = os.path.join(tmpdir, filenames[0], "lnt.cfg")
         else:
             config_path = path
 
         if not config_path or not os.path.exists(config_path):
-            fatal("invalid config: %r" % config_path)
+            raise Exception("Invalid config: %r" % config_path)
 
         config_data = {}
         exec open(config_path) in config_data

Modified: lnt/trunk/lnt/server/reporting/analysis.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/server/reporting/analysis.py?rev=312658&r1=312657&r2=312658&view=diff
==============================================================================
--- lnt/trunk/lnt/server/reporting/analysis.py (original)
+++ lnt/trunk/lnt/server/reporting/analysis.py Wed Sep  6 11:22:23 2017
@@ -21,12 +21,7 @@ def absmin_diff(current, prevs):
     Given more than one min, use the last one detected which is probably a
     newer value. Returns (difference, prev used)
     """
-    try:
-        diffs = [abs(current-prev) for prev in prevs]
-    except:
-        print current, prevs
-        import sys
-        sys.exit(1)
+    diffs = [abs(current-prev) for prev in prevs]
     smallest_pos = 0
     smallest = diffs[0]
     for i, diff in enumerate(diffs):