From 0e9e780dafe201e60c76e1b29264afd67349c2d1 Mon Sep 17 00:00:00 2001 From: Mike Crute Date: Sat, 7 Oct 2017 22:44:02 +0000 Subject: Fix blowfish test and travis --- .travis.yml | 2 +- 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: # Travis versions of these are really outdated - pip install -U mock nose pytest # Only used in production for python3.4- but required for tests - - pip install cryptograpy + - pip install cryptography script: - 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): def setUp(self): # Ugh... blowfish can't even be *imported* in python2 - if sys.version_info.major == 2: + if not t.blowfish: t.blowfish = Mock() self.cipher = Mock() -- cgit v1.2.3