don't swallow errors when testing

google · Oct 7, 2016 · de42c6e · de42c6e
1 parent 53caf1c
commit de42c6e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/enjarify/hashtests.py b/enjarify/hashtests.py
@@ -28,8 +28,7 @@
 
     for bits in range(256):
         opts = options.Options(*[bool(bits & (1 << b)) for b in range(8)])
-        classes, errors = translate(rawdex, opts=opts)
-        assert not errors
+        classes, errors = translate(rawdex, opts=opts, allowErrors=False)
 
         for cls in classes.values():
             print('{:08b}'.format(bits), hashlib.sha256(cls).hexdigest())

diff --git a/enjarify/main.py b/enjarify/main.py
@@ -23,7 +23,7 @@ def read(fname, mode='rb'):
     with open(fname, mode) as f:
         return f.read()
 
-def translate(data, opts, classes=None, errors=None):
+def translate(data, opts, classes=None, errors=None, allowErrors=True):
     dex = parsedex.DexFile(data)
     classes = collections.OrderedDict() if classes is None else classes
     errors = collections.OrderedDict() if errors is None else errors
@@ -38,6 +38,8 @@ def translate(data, opts, classes=None, errors=None):
             class_data = writeclass.toClassFile(cls, opts)
             classes[unicode_name] = class_data
         except Exception:
+            if not allowErrors:
+                raise
             errors[unicode_name] = traceback.format_exc()
 
         if not (len(classes) + len(errors)) % 1000:

diff --git a/enjarify/runtests.py b/enjarify/runtests.py
@@ -27,8 +27,7 @@ def executeTest(name, opts):
     print('running test', name)
     dir = os.path.join('tests', name)
     rawdex = read(os.path.join(dir, 'classes.dex'), 'rb')
-    classes, errors = translate(rawdex, opts=opts)
-    assert not errors
+    classes, errors = translate(rawdex, opts=opts, allowErrors=False)
 
     classes.update(STUB_FILES)
     writeToJar('out.jar', classes)