riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #8301 from aabadie/pr/flake8/testrunner

Browse Source 
dist/tools/testrunner: fix flake8 remaining issues
This commit is contained in:
Alexandre Abadie 2017-12-20 16:16:12 +01:00 committed by GitHub
commit 2a0b34d25d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@ -1,7 +1,8 @@
dist: trusty dist: trusty
before_install: before_install:
- sudo apt-get install coreutils realpath doxygen graphviz python-lesscpy cppcheck coccinelle pcregrep python3-flake8 - sudo apt-get install coreutils realpath doxygen graphviz python-lesscpy cppcheck coccinelle pcregrep python3-pip
- sudo pip3 install flake8
script: script:
- make static-test - make static-test

6
dist/tools/testrunner/testrunner.py vendored
View File

@ -17,7 +17,7 @@ import pexpect
PEXPECT_PATH = os.path.dirname(pexpect.__file__) PEXPECT_PATH = os.path.dirname(pexpect.__file__)
RIOTBASE = os.environ['RIOTBASE'] or \ RIOTBASE = os.environ['RIOTBASE'] or \
os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..", "..")) os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..", ".."))
# Setting an empty 'TESTRUNNER_START_DELAY' environment variable use the # Setting an empty 'TESTRUNNER_START_DELAY' environment variable use the
# default value (3) # default value (3)
@ -27,12 +27,14 @@ MAKE_TERM_STARTED_DELAY = int(os.environ.get('TESTRUNNER_START_DELAY') or 3)
def list_until(l, cond): def list_until(l, cond):
return l[:([i for i, e in enumerate(l) if cond(e)][0])] return l[:([i for i, e in enumerate(l) if cond(e)][0])]
def find_exc_origin(exc_info): def find_exc_origin(exc_info):
pos = list_until(extract_tb(exc_info), pos = list_until(extract_tb(exc_info),
lambda frame: frame[0].startswith(PEXPECT_PATH) lambda frame: frame[0].startswith(PEXPECT_PATH)
)[-1] )[-1]
return (pos[3], os.path.relpath(os.path.abspath(pos[0]), RIOTBASE), pos[1]) return (pos[3], os.path.relpath(os.path.abspath(pos[0]), RIOTBASE), pos[1])
def run(testfunc, timeout=10, echo=True, traceback=False): def run(testfunc, timeout=10, echo=True, traceback=False):
env = os.environ.copy() env = os.environ.copy()
child = pexpect.spawnu("make term", env=env, timeout=timeout) child = pexpect.spawnu("make term", env=env, timeout=timeout)