Merge pull request #5406 from benjaoming/assert-device-registration

Remove debug exception expression + testing that register device view works

Author: benjaoming

circle.yml

@@ -20,7 +20,7 @@ test:
     - make assets
     - make docs
     - kalite start --traceback -v2
-    - sleep 4s  # Necessary for server to be ready
+    - sleep 6s  # Necessary for server to be ready
     - kalite status
     - kalite stop --traceback -v2
     - case $CIRCLE_NODE_INDEX in 0) coverage run --source=kalite --omit="kalite/testing/*,*/tests/*,*/migrations/*,kalite/packages/*" bin/kalite manage test --bdd-only ;; 1) coverage run --source=kalite --omit="kalite/testing/*,kalite/packages/*,*/tests/*,*/migrations/*" bin/kalite manage test --no-bdd;; esac:

kalite/distributed/features/steps/superuser_create.py

@@ -103,7 +103,7 @@ def step_impl(context):
 
 @then("the modal will dismiss")
 def impl(context):
-    assert elem_is_invisible_with_wait(context, context.modal_element, wait_time=5), "modal not dismissed!"
+    assert elem_is_invisible_with_wait(context, context.modal_element, wait_time=7), "modal not dismissed!"
 
 
 def fill_field(context, text, field_id):

kalite/packages/bundled/fle_utils/internet/functions.py

@@ -1,18 +1,19 @@
 """
 For functions mucking with internet access
 """
-import ifcfg
 import logging
 import os
 import platform
 import re
 import requests
-
+from urllib import urlencode
+from urlparse import parse_qs, urlsplit, urlunsplit, urljoin
 
 from django.conf import settings
+import ifcfg
+
 from django.core.urlresolvers import reverse
-from urlparse import parse_qs, urlsplit, urlunsplit, urljoin
-from urllib import urlencode
+from requests.exceptions import ConnectionError, ReadTimeout
 
 
 logger = logging.getLogger(__name__)
@@ -25,10 +26,12 @@ def am_i_online():
     """
     from kalite.version import user_agent
 
+    timeout = 15  # seconds
     url = urljoin(settings.CENTRAL_SERVER_URL, reverse("get_server_info"))
 
     try:
-        response = requests.get(url, timeout=5, allow_redirects=False, headers={"user-agent": user_agent()})
+        # Based on experience, 5 seconds is too little
+        response = requests.get(url, timeout=timeout, allow_redirects=False, headers={"user-agent": user_agent()})
 
         # Validate that response came from the requested url
         if response.status_code != 200:
@@ -38,6 +41,17 @@ def am_i_online():
 
         return True
 
+    except ReadTimeout:
+        logger.info(
+            ("Assuming offline status, timeout={} seconds, timed out while "
+             "fetching {}").format(timeout, url)
+        )
+        return False
+    except ConnectionError:
+        logger.info(
+            "Assuming offline status, connection error while fetching {}".format(url)
+        )
+        return False
     except Exception as e:
         logger.warning("Unhandled exception when detecting if online: {}".format(e))
         return False

kalite/packages/bundled/securesync/devices/views.py

@@ -43,8 +43,6 @@ def initialize_registration():
 @render_to("securesync/register_public_key_client.html")
 def register_public_key_client(request):
 
-    raise Exception("Ben is testing")
-
     # Delete the registration state from the session to ensure it is refreshed next pageload
     del request.session["registered"]
 

kalite/updates/tests/regression_tests.py

@@ -1,3 +1,4 @@
+import logging
 import requests
 
 from django.test.utils import override_settings
@@ -8,6 +9,11 @@
 
 from kalite.testing.base import KALiteClientTestCase
 from kalite.testing.mixins.django_mixins import CreateAdminMixin
+from requests.exceptions import ConnectionError
+
+
+logger = logging.getLogger(__name__)
+
 
 class RegistrationRedirectTestCase(CreateAdminMixin, KALiteClientTestCase):
     """
@@ -23,13 +29,23 @@ def setUp(self):
         self.client.login(**admin_data)
 
     def test_online(self):
-        response = requests.get("http://google.com",)
-        google_is_online = response.status_code in (200, 301)
+        try:
+            response = requests.get("http://google.com",)
+            google_is_online = response.status_code in (200, 301)
+        except ConnectionError:
+            logger.warning("Running test_online while offline")
+            google_is_online = False
+        
         self.assertEqual(am_i_online(), google_is_online)
 
     @override_settings(CENTRAL_SERVER_URL="http://127.0.0.1:8997")  # We hope this is unreachable
     def test_not_redirected_when_offline(self):
         self.assertFalse(Device.get_own_device().is_registered(), "The device should be unregistered!")
+        
+        register_device_url = self.reverse("register_public_key")
+        response = self.client.get(register_device_url, follow=False)
+        self.assertEqual(response.status_code, 200)
+        
         self.assertFalse(am_i_online(), "Central server should be unreachable!")
         updated_videos_url = self.reverse("update_videos")
         response = self.client.get(updated_videos_url, follow=True)