Merge pull request #22 from johandahlberg/no_error_on_next

Do not raise error when there is no runfolder
arteria-project · Sep 13, 2018 · 460c231 · 460c231
2 parents f9c8f03 + 4f45bfc
commit 460c231
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/runfolder/handlers.py b/runfolder/handlers.py
@@ -66,7 +66,10 @@ def get(self):
         runfolder_info = self.runfolder_svc.next_runfolder()
         if runfolder_info:
             self.append_runfolder_link(runfolder_info)
-        self.write_object(runfolder_info)
+            self.write_object(runfolder_info)
+        else:
+            self.set_status(204, reason="No ready runfolder available.")
+            self.write(dict())
 
 
 class PickupAvailableRunfolderHandler(BaseRunfolderHandler):

diff --git a/runfolder_tests/integration/rest_tests.py b/runfolder_tests/integration/rest_tests.py
@@ -139,6 +139,10 @@ def test_next_runfolder(self):
         # Remove the path created, so it does not interfere with other tests
         shutil.rmtree(path)
 
+    def test_call_next_without_ready_runfolder(self):
+        # Status code 204 is no content.
+        response = self.get("./runfolders/next", expect=204)
+
     def _exists(self, path):
         resp = self.get("./runfolders")
         runfolders = resp.body_obj["runfolders"]