Disable embedly everywhere.

(Before it had been disabled only on prod/staging, but we are
removing it everywhere, motivated by making tests run faster.
In particular, the call to embedly_client.is_supported() was
expensive, as it went over the Internet.)

(imported from commit ea12bf6e7ae84ce7e8023a0d314ecc4c07cbc0a8)

humbug/settings.py

@@ -577,6 +577,12 @@ if DEPLOYED:
 
 FILE_UPLOAD_MAX_MEMORY_SIZE = 0
 
+# We are not currently using embedly due to some performance issues, but
+# we are keeping the code on master for now, behind this launch flag.
+# If you turn this back on for dev, you will want it to be still False
+# for running the tests, or you will need to ensure that embedly_client.is_supported()
+# gets called before the tests run.
+USING_EMBEDLY = False
 EMBEDLY_KEY="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
 
 if DEPLOYED:

zephyr/lib/bugdown/__init__.py

@@ -24,8 +24,10 @@ from zephyr.lib.bugdown import codehilite, fenced_code
 from zephyr.lib.bugdown.fenced_code import FENCE_RE
 from zephyr.lib.timeout import timeout, TimeoutExpired
 from zephyr.lib.cache import cache_with_key, cache_get_many, cache_set_many
-from embedly import Embedly
 
+
+if settings.USING_EMBEDLY:
+    from embedly import Embedly
     embedly_client = Embedly(settings.EMBEDLY_KEY, timeout=2.5)
 
 # Format version of the bugdown rendering; stored along with rendered
@@ -211,14 +213,14 @@ class InlineInterestingLinkProcessor(markdown.treeprocessors.Treeprocessor):
             return None
 
     def do_embedly(self, root, supported_urls):
-        # embed.ly support disabled on prod/staging until it can be
+        # embed.ly support is disabled until it can be
         # properly debugged.
         #
         # We're not deleting the code for now, since we expect to
         # restore it and want to be able to update it along with
         # future refactorings rather than keeping it as a separate
         # branch.
-        if settings.DEPLOYED:
+        if not settings.USING_EMBEDLY:
             return
 
         # We want this to be able to easily reverse the hashing later
@@ -311,6 +313,7 @@ class InlineInterestingLinkProcessor(markdown.treeprocessors.Treeprocessor):
                 div.set("class", "inline-preview-twitter")
                 div.insert(0, twitter_data)
                 continue
+            if settings.USING_EMBEDLY:
                 if embedly_client.is_supported(url):
                     embedly_urls.append(url)
                     continue
@@ -321,6 +324,7 @@ class InlineInterestingLinkProcessor(markdown.treeprocessors.Treeprocessor):
                 add_a(root, youtube, url)
                 continue
 
+        if settings.USING_EMBEDLY:
             self.do_embedly(root, embedly_urls)
 
 class Gravatar(markdown.inlinepatterns.Pattern):

zephyr/tests.py

@@ -2209,12 +2209,14 @@ xxxxxxx</strong></p>\n<p>xxxxxxx xxxxx xxxx xxxxx:<br>\n<code>xxxxxx</code>: xxx
         self.assertEqual(converted, '<p>Google logo today: <a href="https://www.google.com/images/srpr/logo4w.png" target="_blank" title="https://www.google.com/images/srpr/logo4w.png">https://www.google.com/images/srpr/logo4w.png</a><br>\nKinda boringGoogle logo today: <a href="https://www.google.com/images/srpr/logo4w.png" target="_blank" title="https://www.google.com/images/srpr/logo4w.png">https://www.google.com/images/srpr/logo4w.png</a><br>\nKinda boring</p>\n<div class="message_inline_image"><a href="https://www.google.com/images/srpr/logo4w.png" target="_blank" title="https://www.google.com/images/srpr/logo4w.png"><img src="https://www.google.com/images/srpr/logo4w.png"></a></div><div class="message_inline_image"><a href="https://www.google.com/images/srpr/logo4w.png" target="_blank" title="https://www.google.com/images/srpr/logo4w.png"><img src="https://www.google.com/images/srpr/logo4w.png"></a></div>')
 
 
-    @slow(0.67, 'Bugdown is slow')
     def test_inline_youtube(self):
         msg = 'Check out the debate: http://www.youtube.com/watch?v=hx1mjT73xYE'
         converted = bugdown_convert(msg)
 
+        if settings.USING_EMBEDLY:
             self.assertEqual(converted, '<p>Check out the debate: <a href="http://www.youtube.com/watch?v=hx1mjT73xYE" target="_blank" title="http://www.youtube.com/watch?v=hx1mjT73xYE">http://www.youtube.com/watch?v=hx1mjT73xYE</a></p>\n<iframe width="250" height="141" src="http://www.youtube.com/embed/hx1mjT73xYE?feature=oembed" frameborder="0" allowfullscreen></iframe>')
+        else:
+            self.assertEqual(converted, '<p>Check out the debate: <a href="http://www.youtube.com/watch?v=hx1mjT73xYE" target="_blank" title="http://www.youtube.com/watch?v=hx1mjT73xYE">http://www.youtube.com/watch?v=hx1mjT73xYE</a></p>\n<div class="message_inline_image"><a href="http://www.youtube.com/watch?v=hx1mjT73xYE" target="_blank" title="http://www.youtube.com/watch?v=hx1mjT73xYE"><img src="http://i.ytimg.com/vi/hx1mjT73xYE/default.jpg"></a></div>')
 
     def test_inline_dropbox(self):
         msg = 'Look at how hilarious our old office was: https://www.dropbox.com/s/ymdijjcg67hv2ta/IMG_0923.JPG'
@@ -2700,7 +2702,6 @@ class BeanstalkHookTests(AuthedTestCase):
 * [e50508d](http://lfranchi-svn.beanstalkapp.com/work-test/changesets/e50508df): add some stuff
 """)
 
-    @slow(1.3, 'talks to beanstalk')
     def test_git_multiple(self):
         msg = self.send_beanstalk_message('git_multiple')
         self.assertEqual(msg.subject, "work-test")