Skip to content

Commit

Permalink
Adding py36 envtest. Not all tests passing tho.
Browse files Browse the repository at this point in the history
  • Loading branch information
asolino committed Oct 11, 2018
1 parent 16d658e commit f70d0cc
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 7 deletions.
3 changes: 0 additions & 3 deletions tests/coveragerc
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,3 @@ ignore_errors = True

[html]
directory = coverage_html_report

[report]
ignore_errors = True
9 changes: 7 additions & 2 deletions tests/runall.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ if [ $# -gt 0 ]
then
SUFFIX=$1
# Only run coverage when called by tox
RUN="coverage run --append --rcfile=../coveragerc "
RUNLOCAL="coverage run --append --rcfile=./coveragerc "
RUN="python -m coverage run --append --rcfile=../coveragerc "
RUNLOCAL="python -m coverage run --append --rcfile=./coveragerc "
COVERAGE=true
else
SUFFIX=XX
Expand Down Expand Up @@ -43,10 +43,15 @@ cd ../dot11
echo Testing SMB RPC/LDAP
cd ../SMB_RPC
export PYTHONPATH=../../:$PYTHONPATH
echo test_smb.py
$RUN test_smb.py 2>&1 1>/dev/null | tee -a $OUTPUTFILE
echo test_spnego.py
$RUN test_spnego.py 2>&1 1>/dev/null | tee -a $OUTPUTFILE
echo test_ldap.py
$RUN test_ldap.py 2>&1 1>/dev/null | tee -a $OUTPUTFILE
echo test_nmb.py
$RUN test_nmb.py 2>&1 1>/dev/null | tee -a $OUTPUTFILE
echo test_ntlm.py
$RUN test_ntlm.py 2>&1 1>/dev/null | tee -a $OUTPUTFILE
./rundce.sh $COVERAGE 2>&1 1>/dev/null | tee -a $OUTPUTFILE
cd ..
Expand Down
2 changes: 1 addition & 1 deletion tests/walkmodules.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@
except Exception as e:
import traceback
traceback.print_exc()
print str(e)
print(e)
pass
3 changes: 2 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
# content of: tox.ini , put in same dir as setup.py
[tox]
#envlist = py26#, py27,py36
envlist = py27#,py36
envlist = py27,py36
[testenv]
basepython =
py26: python2.6
py27: python2.7
py36: python3.6
changedir = {toxinidir}/tests
deps=-rrequirements.txt
coverage
py26: wheel==0.29.0
commands=./runall.sh {envname} > /dev/null

0 comments on commit f70d0cc

Please sign in to comment.