update tests for django >1.6, disable integration tests until I can figure out a good local solution

binder/tests/__init__.py

@@ -1,6 +0,0 @@
-from forms import *
-from helpers import *
-from models import *
-from views import *
-
-from integration import *

binder/tests/testHelpers.py

@@ -7,10 +7,7 @@ class HelperTests(TestCase):
         response = helpers.ip_info("foobar.doesnotexist.local")
         self.assertEqual([['Error', u'Unable to resolve foobar.doesnotexist.local: [Errno -2] Name or service not known']],
                          response)
-        # The following is currently the first globally unique IPv4 and IPv6 address I could find
+        response = helpers.ip_info("time1.google.com")
-        # that did not change based upon your geography.
+        self.assertEqual([['IPv4 (1)', u'216.239.32.15'], ['IPv6 (1)', u'2001:4860:4802:32::f']],
-        # http://test-ipv6.com/
-        response = helpers.ip_info("ds.test-ipv6.com")
-        self.assertEqual([['IPv4 (1)', u'216.218.228.114'], ['IPv6 (1)', u'2001:470:1:18::2']],
                          response)
 

binder/tests/testViews.py

@@ -78,16 +78,3 @@ class PostTests(TestCase):
         self.assertContains(response,
                             '<input type="hidden" name="dns_server" value="testserver.test.net" />',
                             html=True)
-
-
-class HelperTests(TestCase):
-    def test_ipinfo_ResolutionFail(self):
-        response = helpers.ip_info("foobar.doesnotexist.local")
-        self.assertEqual([['Error', u'Unable to resolve foobar.doesnotexist.local: [Errno -2] Name or service not known']],
-                         response)
-        # The following is currently the first globally unique IPv4 and IPv6 address I could find
-        # that did not change based upon your geography.
-        # http://test-ipv6.com/
-        response = helpers.ip_info("ds.test-ipv6.com")
-        self.assertEqual([['IPv4 (1)', u'216.218.228.114'], ['IPv6 (1)', u'2001:470:1:18::2']],
-                         response)