fix error failure and move APP_SLUG into constants (bug moving-app-slug)

apps/constants/base.py

@@ -335,3 +335,5 @@
     CANNED_RESPONSE_APP: _('App'),
     CANNED_RESPONSE_PERSONA: _('Persona'),
 }
+
+APP_SLUG = r"""(?P<app_slug>[^/<>"']+)"""

apps/devhub/urls.py

@@ -4,9 +4,9 @@
 from lib.misc.urlconf_decorator import decorate
 
 from addons.urls import ADDON_ID
+import amo
 from amo.decorators import write
 from devhub.decorators import use_apps
-from mkt.urls import APP_SLUG
 from . import views
 
 PACKAGE_NAME = '(?P<package_name>[_\w]+)'
@@ -231,7 +231,7 @@ def marketplace_patterns(prefix):
 
     # URLs for a single add-on.
     url('^addon/%s/' % ADDON_ID, include(detail_patterns)),
-    url('^app/%s/' % APP_SLUG, include(app_detail_patterns)),
+    url('^app/%s/' % amo.APP_SLUG, include(app_detail_patterns)),
     url('^app/%s/submit/' % ADDON_ID, include(submit_apps_patterns)),
 
     url('^ajax/addon/%s/' % ADDON_ID, include(ajax_patterns)),

apps/paypal/tests/test_views.py

@@ -239,6 +239,7 @@ def test_query_string_order(self, urlopen):
         _, path, _ = urlopen.call_args[0]
         eq_(path, 'cmd=_notify-validate&%s' % query)
 
+    @patch.object(settings, 'IN_TEST_SUITE', False)
     def test_any_exception(self, urlopen):
         urlopen.side_effect = Exception()
         response = self.client.post(self.url)

mkt/developers/urls.py

@@ -3,9 +3,9 @@
 
 from lib.misc.urlconf_decorator import decorate
 
+import amo
 from amo.decorators import write
 from mkt.developers.decorators import use_apps
-from mkt.urls import APP_SLUG
 from . import views
 
 
@@ -113,8 +113,8 @@ def paypal_patterns(prefix):
         name='mkt.developers.upload_manifest'),
 
     # URLs for a single app.
-    url('^app/%s/' % APP_SLUG, include(app_detail_patterns)),
-    url('^ajax/app/%s/' % APP_SLUG, include(ajax_patterns)),
+    url('^app/%s/' % amo.APP_SLUG, include(app_detail_patterns)),
+    url('^ajax/app/%s/' % amo.APP_SLUG, include(ajax_patterns)),
 
     # Developer docs
     url('docs/(?P<doc_name>[-_\w]+)?$',

mkt/reviewers/urls.py

@@ -1,6 +1,6 @@
 from django.conf.urls.defaults import url
 
-from mkt.urls import APP_SLUG
+import amo
 from . import views
 
 
@@ -9,7 +9,7 @@
     url(r'^$', views.home, name='reviewers.home'),
     url(r'^apps/queue/$', views.queue_apps,
         name='reviewers.apps.queue_pending'),
-    url(r'^apps/review/%s$' % APP_SLUG, views.app_review,
+    url(r'^apps/review/%s$' % amo.APP_SLUG, views.app_review,
         name='reviewers.apps.review'),
     url(r'^apps/logs$', views.logs, name='reviewers.apps.logs'),
     url(r'^apps/motd$', views.motd, name='reviewers.apps.motd'),

mkt/submit/urls.py

@@ -2,26 +2,27 @@
 
 from lib.misc.urlconf_decorator import decorate
 
+import amo
 from amo.decorators import write
-from mkt.urls import APP_SLUG
 from . import views
 
 
 # These URLs start with /developers/submit/app/<app_slug>/.
 submit_apps_patterns = patterns('',
-    url('^details/%s$' % APP_SLUG, views.details, name='submit.app.details'),
-    url('^payments/%s$' % APP_SLUG, views.payments,
+    url('^details/%s$' % amo.APP_SLUG, views.details,
+        name='submit.app.details'),
+    url('^payments/%s$' % amo.APP_SLUG, views.payments,
         name='submit.app.payments'),
-    url('^payments/upsell/%s$' % APP_SLUG, views.payments_upsell,
+    url('^payments/upsell/%s$' % amo.APP_SLUG, views.payments_upsell,
         name='submit.app.payments.upsell'),
-    url('^payments/paypal/%s$' % APP_SLUG, views.payments_paypal,
+    url('^payments/paypal/%s$' % amo.APP_SLUG, views.payments_paypal,
         name='submit.app.payments.paypal'),
-    url('^payments/bounce/%s$' % APP_SLUG, views.payments_bounce,
+    url('^payments/bounce/%s$' % amo.APP_SLUG, views.payments_bounce,
         name='submit.app.payments.bounce'),
-    url('^payments/confirm/%s$' % APP_SLUG, views.payments_confirm,
+    url('^payments/confirm/%s$' % amo.APP_SLUG, views.payments_confirm,
         name='submit.app.payments.confirm'),
-    url('^done/%s$' % APP_SLUG, views.done, name='submit.app.done'),
-    url('^resume/%s$' % APP_SLUG, views.resume, name='submit.app.resume'),
+    url('^done/%s$' % amo.APP_SLUG, views.done, name='submit.app.done'),
+    url('^resume/%s$' % amo.APP_SLUG, views.resume, name='submit.app.resume'),
 )
 
 

mkt/urls.py

@@ -1,10 +1,10 @@
-from django.conf import settings
 from django.conf.urls.defaults import patterns, url, include
 from django.contrib import admin
 from django.shortcuts import redirect
 from django.views.decorators.cache import cache_page
 from django.views.i18n import javascript_catalog
 
+import amo
 from apps.users.views import logout
 from apps.users.urls import (detail_patterns as user_detail_patterns,
                              users_patterns as users_users_patterns)
@@ -19,15 +19,13 @@
 handler404 = 'mkt.site.views.handler404'
 handler500 = 'mkt.site.views.handler500'
 
-APP_SLUG = r"""(?P<app_slug>[^/<>"']+)"""
-
 
 urlpatterns = patterns('',
     # Home.
     url('^$', 'mkt.home.views.home', name='home'),
 
     # App Detail pages.
-    ('^app/%s/' % APP_SLUG, include('mkt.detail.urls')),
+    ('^app/%s/' % amo.APP_SLUG, include('mkt.detail.urls')),
 
     # Browse pages.
     ('^apps/', include('mkt.browse.urls')),