diff options
| author | Mike Crute <mike@crute.us> | 2017-10-07 22:44:02 +0000 |
|---|---|---|
| committer | Mike Crute <mike@crute.us> | 2017-10-07 22:44:02 +0000 |
| commit | 0e9e780dafe201e60c76e1b29264afd67349c2d1 (patch) | |
| tree | 0034d4dc8921da8e9c65f7cadef3a1e2549518fd | |
| parent | d302a17de6841f5f6a05c193bb2c8406a674580d (diff) | |
| download | pydora-0e9e780dafe201e60c76e1b29264afd67349c2d1.tar.bz2 pydora-0e9e780dafe201e60c76e1b29264afd67349c2d1.tar.xz pydora-0e9e780dafe201e60c76e1b29264afd67349c2d1.zip | |
Fix blowfish test and travis
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | tests/test_pandora/test_transport.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index c765ec3..6aa1c82 100644 --- a/.travis.yml +++ b/.travis.yml | |||
| @@ -9,6 +9,6 @@ before_script: | |||
| 9 | # Travis versions of these are really outdated | 9 | # Travis versions of these are really outdated |
| 10 | - pip install -U mock nose pytest | 10 | - pip install -U mock nose pytest |
| 11 | # Only used in production for python3.4- but required for tests | 11 | # Only used in production for python3.4- but required for tests |
| 12 | - pip install cryptograpy | 12 | - pip install cryptography |
| 13 | script: | 13 | script: |
| 14 | - python setup.py validate | 14 | - python setup.py validate |
diff --git a/tests/test_pandora/test_transport.py b/tests/test_pandora/test_transport.py index 4717617..08e3292 100644 --- a/tests/test_pandora/test_transport.py +++ b/tests/test_pandora/test_transport.py | |||
| @@ -271,7 +271,7 @@ class TestPurePythonBlowfishCryptor(TestCase, CommonCryptorTestCases): | |||
| 271 | 271 | ||
| 272 | def setUp(self): | 272 | def setUp(self): |
| 273 | # Ugh... blowfish can't even be *imported* in python2 | 273 | # Ugh... blowfish can't even be *imported* in python2 |
| 274 | if sys.version_info.major == 2: | 274 | if not t.blowfish: |
| 275 | t.blowfish = Mock() | 275 | t.blowfish = Mock() |
| 276 | 276 | ||
| 277 | self.cipher = Mock() | 277 | self.cipher = Mock() |