Fixed up celery worker thread start and incorrect model name

galaxyproject · Oct 12, 2018 · ea8b5ec · ea8b5ec
1 parent 0bf15d9
commit ea8b5ec
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/django-cloudlaunch/cloudlaunchserver/apps.py b/django-cloudlaunch/cloudlaunchserver/apps.py
@@ -18,12 +18,10 @@ def ready(self):
             # https://stackoverflow.com/questions/22233680/in-memory-broker-for-celery-unit-tests
             # Also refer: https://github.com/celery/celerytest
             app.control.purge()
-            celery_worker = app.Worker(app=app, pool='solo', concurrency=1)
-            #connections.close_all()
-            worker_thread = threading.Thread(target=celery_worker.start)
+            worker_thread = threading.Thread(target=app.worker_main)
             worker_thread.daemon = True
             worker_thread.start()
-        
+
             @receiver(django_server_shutdown)
             def on_shutdown(sender, **kwargs):
                 # Do nothing. Calling stop results in celery hanging waiting for keyboard input

diff --git a/tests/fixtures/initial_test_data.json b/tests/fixtures/initial_test_data.json
@@ -18,7 +18,7 @@
   }
 },
 {
-  "model": "cloudlaunch.token",
+  "model": "cloudlaunch.authtoken",
   "pk": "1",
   "fields": {
     "user": 3000,