diff options
| author | Tomás Touceda <chiiph@leap.se> | 2014-07-18 11:22:47 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2014-07-18 11:22:47 -0300 |
| commit | 159dbe295148975bdfe9a50f871254aa9adf2328 (patch) | |
| tree | 5b679b7f617c4bc09c25a4c369e77156f0ff3e2c /src/leap/bitmask/services/eip/tests | |
| parent | 7858d83af4a09ab00f6ba33dd8dbcf07ade101ce (diff) | |
| parent | 312746bc9b77f0f738ccf2192d81ab94fdf9d6ba (diff) | |
Merge branch 'release-0.6.0'0.6.0
Diffstat (limited to 'src/leap/bitmask/services/eip/tests')
| -rw-r--r-- | src/leap/bitmask/services/eip/tests/test_eipbootstrapper.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/leap/bitmask/services/eip/tests/test_eipbootstrapper.py b/src/leap/bitmask/services/eip/tests/test_eipbootstrapper.py index 6640a860..1888f2c9 100644 --- a/src/leap/bitmask/services/eip/tests/test_eipbootstrapper.py +++ b/src/leap/bitmask/services/eip/tests/test_eipbootstrapper.py @@ -30,7 +30,7 @@ import time try: import unittest2 as unittest except ImportError: - import unittest + import unittest # noqa - skip 'unused import' warning from nose.twistedtools import deferred, reactor from twisted.internet import threads |