DeforaNetworks/manticore
3
0
Fork 0
Code Releases Activity

Fix verbosity=1 (#345)

Browse Source 
* Only enable debug executor after verbosity 1

* Add regression test for checking uniform cli output for nonverbose mode
This commit is contained in:
Mark Mossberg
2017-06-21 17:48:37 -04:00
committed by GitHub
parent 860d51ebf1
commit 3ec9043b2e
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
manticore/manticore.py
+2 -2
View File
@@ -271,8 +271,8 @@ class Manticore(object):
@verbosity.setter
def verbosity(self, setting):
levels = [[],
[('MAIN', logging.INFO), ('EXECUTOR', logging.DEBUG)],
[('PLATFORM', logging.DEBUG)],
[('MAIN', logging.INFO), ('EXECUTOR', logging.INFO)],
[('PLATFORM', logging.DEBUG), ('EXECUTOR', logging.DEBUG)],
[('MEMORY', logging.DEBUG), ('CPU', logging.DEBUG)],
[('REGISTERS', logging.DEBUG)],
[('SMT', logging.DEBUG)]]
tests/test_binaries.py
+16
View File
@@ -1,3 +1,4 @@
import StringIO
import unittest
import sys
import shutil
@@ -54,6 +55,21 @@ class IntegrationTest(unittest.TestCase):
'+++++++++'], stdout=output)
self.assertTrue(time.time()-t < 20)
def test_cli_verbosity(self):
"""
Tests that default verbosity should result in output like below, with only the
"Generating testcase" lines printed as main output.
2017-06-21 17:14:24,119: [111703] MAIN:INFO: Loading program: ['/mnt/hgfs/code/manticore/tests/binaries/basic_linux_amd64']
2017-06-21 17:14:24,120: [111703] MAIN:INFO: Workspace: /mnt/hgfs/code/manticore/tests/mcore_rtDVZS
2017-06-21 17:14:30,369: [111762][3] EXECUTOR:INFO: Generating testcase No. 1 for state No.3 - Program finished correctly
2017-06-21 17:14:31,294: [111762][5] EXECUTOR:INFO: Generating testcase No. 2 for state No.5 - Program finished correctly
"""
dirname = os.path.dirname(__file__)
filename = os.path.join(dirname, 'binaries/basic_linux_amd64')
output = subprocess.check_output(['python', '-m', 'manticore', filename])
self.assertEqual(len(output.splitlines()), 4)
@unittest.skip('TODO(mark); skipping so we can move on with our lives and merge x86_new. ask felipe to fix later.')
def testArgumentsAssertions(self):