Tests Not Running?

Doesn’t seem like Travis was actually running the tests, and hit some 2/3 issues along the way. Fingers crossed.

Signed-off-by: Geoffrey Wiseman <geoffrey.wiseman@codiform.com>

.travis.yml

@@ -7,6 +7,7 @@ install:
   - pip install .
 script:
   - python setup.py test
+  - pytest
 
 matrix:
   include:

awswl/commands.py

@@ -1,5 +1,10 @@
 from __future__ import unicode_literals
-from builtins import dict, str
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from future import standard_library
+standard_library.install_aliases()
+from builtins import str
 
 import boto3
 import botocore

tests/test_cli.py

@@ -1,3 +1,9 @@
+from __future__ import unicode_literals
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from future import standard_library
+standard_library.install_aliases()
 import os
 import pytest
 
@@ -9,7 +15,7 @@ def fixture_env_sgid():
     sgid = "sg-12345"
     os.environ[cli.AWSWL_SGID_KEY] = sgid
     yield sgid
-    os.environ.unsetenv(cli.AWSWL_SGID_KEY)
+    del os.environ[cli.AWSWL_SGID_KEY]
 
 
 def test_parse_empty_arguments():

tests/test_commands.py

@@ -3,11 +3,15 @@
 import pytest
 
 from moto import mock_ec2
-from unittest.mock import patch
 from argparse import Namespace
 from awswl import commands
 import os
 
+try:
+    from unittest.mock import patch
+except ImportError:
+    from mock import patch
+
 AWS_DEFAULT_REGION = 'AWS_DEFAULT_REGION'
 
 

tests/test_externalip.py

@@ -1,7 +1,11 @@
 from awswl import externalip
-from unittest.mock import patch
 from argparse import Namespace
 
+try:
+    from unittest.mock import patch
+except ImportError:
+    from mock import patch
+
 
 @patch('requests.get')
 def test_get_externalip(get_method):