Merge pull request #6975 from readthedocs/humitos/remove-docker-limits

Remove DOCKER_LIMITS

Author: agjohnson

readthedocs/settings/base.py

@@ -374,7 +374,6 @@ def USE_PROMOS(self):  # noqa
     DOCKER_SOCKET = 'unix:///var/run/docker.sock'
     # This settings has been deprecated in favor of DOCKER_IMAGE_SETTINGS
     DOCKER_BUILD_IMAGES = None
-    DOCKER_LIMITS = {'memory': '200m', 'time': 600}
 
     # User used to create the container.
     # In production we use the same user than the one defined by the

readthedocs/settings/test.py

@@ -19,6 +19,9 @@ class CommunityTestSettings(CommunityDevSettings):
     ELASTICSEARCH_DSL_AUTOSYNC = False
     ELASTICSEARCH_DSL_AUTO_REFRESH = True
 
+    # Skip automatic detection of Docker limits for testing
+    DOCKER_LIMITS = {'memory': '200m', 'time': 600}
+
     @property
     def ES_INDEXES(self):  # noqa - avoid pep8 N802
         es_indexes = super(CommunityTestSettings, self).ES_INDEXES