also pep8-test the test script; restore pep8 for update.py

This commit is contained in:
Radovan Bast 2015-06-26 15:34:28 +02:00
parent da02f8eeb1
commit 30c9d38842
3 changed files with 2 additions and 4 deletions

View File

@ -4,4 +4,5 @@ install:
- sudo pip install pytest pep8 - sudo pip install pytest pep8
script: script:
- pep8 --ignore=E501 update.py - pep8 --ignore=E501 update.py
- pep8 --ignore=E501 test/test.py
- py.test -vv test/test.py - py.test -vv test/test.py

View File

@ -3,7 +3,6 @@ import subprocess
HERE = os.path.abspath(os.path.dirname(__file__)) HERE = os.path.abspath(os.path.dirname(__file__))
#-------------------------------------------------------------------------------
def exe(command): def exe(command):
stdout, stderr = subprocess.Popen(command.split(), stdout, stderr = subprocess.Popen(command.split(),
@ -11,7 +10,6 @@ def exe(command):
stderr=subprocess.PIPE).communicate() stderr=subprocess.PIPE).communicate()
return stdout, stderr return stdout, stderr
#-------------------------------------------------------------------------------
def test_cxx(): def test_cxx():
os.chdir(os.path.join(HERE, 'cxx', 'cmake')) os.chdir(os.path.join(HERE, 'cxx', 'cmake'))
@ -25,7 +23,6 @@ def test_cxx():
stdout, stderr = exe('./bin/example') stdout, stderr = exe('./bin/example')
assert 'Hello World!' in stdout assert 'Hello World!' in stdout
#-------------------------------------------------------------------------------
def test_fc(): def test_fc():
os.chdir(os.path.join(HERE, 'fc', 'cmake')) os.chdir(os.path.join(HERE, 'fc', 'cmake'))

View File

@ -61,7 +61,7 @@ def align_options(options):
l = len(opt[0]) l = len(opt[0])
s = [] s = []
for opt in options: for opt in options:
s.append(' %s%s %s' % (opt[0], ' '*(l - len(opt[0])), opt[1])) s.append(' %s%s %s' % (opt[0], ' ' * (l - len(opt[0])), opt[1]))
return '\n'.join(s) return '\n'.join(s)