Fixes to Tests

- Now runs with testr
- flake8 skips contrib

requirements.txt

@@ -1,5 +1,5 @@
 pbr>=0.5.21,<1.0
 python-novaclient==2.15.0
-tldextract
+pythonwhois==2.0.5
-pythonwhois
 six==1.5.2
+tldextract==1.3.1

satori/tests/test_dns.py

@@ -13,6 +13,7 @@
 """Satori DNS Discovery."""
 
 import socket
+import unittest
 
 from freezegun import freeze_time
 import mock
@@ -193,3 +194,6 @@ class TestDNS(utils.TestCase):
     def test_domain_info_returns_array_of_strings_whois_data(self):
         data = dns.domain_info(self.domain)
         self.assertIsInstance(data['whois'][0], str)
+
+if __name__ == "__main__":
+    unittest.main()

tox.ini

@@ -7,9 +7,6 @@ skipdist = True
 usedevelop = True
 install_command = pip install -U {opts} {packages}
 setenv = VIRTUAL_ENV={envdir}
-         LANG=en_US.UTF-8
-         LANGUAGE=en_US:en
-         LC_ALL=C
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 commands = python setup.py testr --testr-args='{posargs}'
@@ -29,4 +26,4 @@ downloadcache = ~/cache/pip
 [flake8]
 ignore = E126,E202,W602,H302,H402
 show-source = True
-exclude =  .venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,tools
+exclude = .venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,tools,satori/contrib