vbatts/shadowsocks
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

skip m2crypto tests on Python 3

Browse source
This commit is contained in:
clowwindy 2014-11-01 12:52:51 +08:00
parent 812a286f12
commit 1205b8c50e
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -16,7 +16,7 @@ before_install:
script: script:
- pep8 . - pep8 .
- pyflakes . - pyflakes .
- python tests/nose_plugin.py - python tests/nose_plugin.py -v
- python tests/test.py -c tests/aes.json - python tests/test.py -c tests/aes.json
- python tests/test.py -c tests/aes-ctr.json - python tests/test.py -c tests/aes-ctr.json
- python tests/test.py -c tests/aes-cfb1.json - python tests/test.py -c tests/aes-cfb1.json

12
shadowsocks/crypto/m2.py
View file

@ -80,18 +80,30 @@ def run_method(method):
def test_aes_128_cfb(): def test_aes_128_cfb():
if bytes != str:
from nose.plugins.skip import SkipTest
raise SkipTest
run_method(b'aes-128-cfb') run_method(b'aes-128-cfb')
def test_aes_256_cfb(): def test_aes_256_cfb():
if bytes != str:
from nose.plugins.skip import SkipTest
raise SkipTest
run_method(b'aes-256-cfb') run_method(b'aes-256-cfb')
def test_bf_cfb(): def test_bf_cfb():
if bytes != str:
from nose.plugins.skip import SkipTest
raise SkipTest
run_method(b'bf-cfb') run_method(b'bf-cfb')
def test_rc4(): def test_rc4():
if bytes != str:
from nose.plugins.skip import SkipTest
raise SkipTest
run_method(b'rc4') run_method(b'rc4')