Skip to content

Commit

Permalink
Remove VALIDATE_ADDONS setting.
Browse files Browse the repository at this point in the history
There's no need for it anymore.
  • Loading branch information
EnTeQuAk committed Mar 14, 2016
1 parent a253766 commit 74f14b4
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 13 deletions.
2 changes: 0 additions & 2 deletions settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,6 @@
SERVICES_DOMAIN = 'localhost:8000'
SERVICES_URL = 'http://%s' % SERVICES_DOMAIN

VALIDATE_ADDONS = True

ADDON_COLLECTOR_ID = 1

# Default AMO user id to use for tasks (from users.json fixture in zadmin).
Expand Down
3 changes: 0 additions & 3 deletions settings_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,6 @@ def _polite_tmpdir():
# Turn off search engine indexing.
USE_ELASTIC = False

# Ensure all validation code runs in tests:
VALIDATE_ADDONS = True

PAYPAL_PERMISSIONS_URL = ''

ENABLE_API_ERROR_SERVICE = False
Expand Down
7 changes: 0 additions & 7 deletions src/olympia/devhub/tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -355,13 +355,6 @@ def run_validator(path, for_appversions=None, test_all_tiers=False,
Not all application versions will have a set of registered
compatibility tests.
"""
if not settings.VALIDATE_ADDONS:
# This should only ever be set on development instances.
# Don't run the validator, just return a skeleton passing result set.
results = deepcopy(amo.VALIDATOR_SKELETON_RESULTS)
results['metadata']['listed'] = listed
return json.dumps(results)

from validator.validate import validate

apps = dump_apps.Command.JSON_PATH
Expand Down
2 changes: 1 addition & 1 deletion src/olympia/lib/settings_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -1425,7 +1425,7 @@ def get_redis_settings(uri):
# Full path or executable path (relative to $PATH) of the spidermonkey js
# binary. It must be a version compatible with amo-validator.
SPIDERMONKEY = None
VALIDATE_ADDONS = True

# Number of seconds before celery tasks will abort addon validation:
VALIDATOR_TIMEOUT = 110

Expand Down

0 comments on commit 74f14b4

Please sign in to comment.