Stress tests: join default max retries now 5

funtests/stress/stress/suite.py

@@ -257,7 +257,7 @@ class Suite(object):
     def missing_results(self, r):
         return [res.id for res in r if res.id not in res.backend._cache]
 
-    def join(self, r, propagate=False, max_retries=1, **kwargs):
+    def join(self, r, propagate=False, max_retries=5, **kwargs):
         received = []
 
         def on_result(task_id, value):

funtests/stress/stress/templates.py

@@ -49,7 +49,6 @@ class default(object):
     CELERY_DEFAULT_QUEUE = CSTRESS_QUEUE
     CELERY_TASK_SERIALIZER = 'json'
     CELERY_RESULT_SERIALIZER = 'json'
-    CELERY_RESULT_PERSISTENT = False
     CELERY_QUEUES = [
         Queue(CSTRESS_QUEUE,
               exchange=Exchange(CSTRESS_QUEUE),