From f9191b1f4be6cc199d759ba23f67f9546d3309ce Mon Sep 17 00:00:00 2001
From: Markus Scheidgen <markus.scheidgen@gmail.com>
Date: Wed, 25 Mar 2020 14:34:33 +0100
Subject: [PATCH] Fix for racecondition during tests. #301
---
.gitignore | 3 ++-
dependencies/parsers/eels | 1 +
nomad/app/api/upload.py | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
create mode 160000 dependencies/parsers/eels
diff --git a/.gitignore b/.gitignore
index 271b38436f..98f3653b17 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,4 +21,5 @@ target/
vscode/
nomad.yaml
gunicorn.log.conf
-gunicorn.conf
\ No newline at end of file
+gunicorn.conf
+nomad/normalizing/data/springer.msg
diff --git a/dependencies/parsers/eels b/dependencies/parsers/eels
new file mode 160000
index 0000000000..3b9b3c802e
--- /dev/null
+++ b/dependencies/parsers/eels
@@ -0,0 +1 @@
+Subproject commit 3b9b3c802ed5c59687e863c0b5487c373a6649a9
diff --git a/nomad/app/api/upload.py b/nomad/app/api/upload.py
index 8655a0e8db..0f093453d4 100644
--- a/nomad/app/api/upload.py
+++ b/nomad/app/api/upload.py
@@ -380,7 +380,7 @@ class UploadResource(Resource):
order_by = ('-%s' if order == -1 else '+%s') % order_by
- calcs = upload.all_calcs((page - 1) * per_page, page * per_page, order_by=order_by)
+ calcs = list(upload.all_calcs((page - 1) * per_page, page * per_page, order_by=order_by))
failed_calcs = upload.failed_calcs
result = ProxyUpload(upload, {
'pagination': dict(
--
GitLab