Merge pull request #433 from Sancus/stopcallingbasket

[Fix Bug 851633] Stop tests from making real POSTs to basket
mozilla · Mar 16, 2013 · f1f5d6e · f1f5d6e
2 parents 165f47c + 0bcfe1f
commit f1f5d6e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/settings/default.py b/settings/default.py
@@ -2,6 +2,7 @@
 
 # Django settings for the mozillians project.
 import logging
+import sys
 
 from funfactory.manage import path
 from funfactory import settings_base as base
@@ -267,7 +268,11 @@
 STATSD_CLIENT = 'django_statsd.clients.normal'
 
 # Basket
-BASKET_URL = 'http://basket.mozilla.com'
+# If we're running tests, don't hit the real basket server.
+if 'test' in sys.argv:
+    BASKET_URL = 'http://127.0.0.1'
+else:
+    BASKET_URL = 'http://basket.mozilla.com'
 BASKET_NEWSLETTER = 'mozilla-phone'
 
 USER_AVATAR_DIR = 'uploads/userprofile'

diff --git a/settings/local.py-devdist b/settings/local.py-devdist
@@ -58,7 +58,7 @@ CACHES = {}
 STATSD_CLIENT = 'django_statsd.clients.log'
 
 # Basket
-BASKET_URL = None
+BASKET_URL = 'http://127.0.0.1'
 BASKET_NEWSLETTER = 'mozilla-phone'
 BASKET_MANAGERS = None # or list of email addresses.