Merge pull request #943 from scitran/missing-version

Version returns 404 if version doc is missing

api/handlers/confighandler.py

@@ -22,4 +22,8 @@ class Version(base.RequestHandler):
 
     def get(self):
         """Return database schema version"""
-        return config.get_version()
+        resp = config.get_version()
+        if resp != None:
+            return resp
+        else:
+            self.abort(404, "Version document does not exist")

test/integration_tests/python/test_handlers.py

@@ -80,8 +80,14 @@ def test_devicehandler(as_user, as_root, as_drone, api_db):
     api_db.devices.remove({'_id': 'test_drone'})
 
 
-def test_config_version(as_user):
+def test_config_version(as_user, api_db):
+    # get database version when no version document exists, It hasn;t been set yet in the tests
+    r = as_user.get('/version')
+    assert r.status_code == 404
+    api_db.singletons.insert_one({"_id":"version","database":3})
+
     # get database schema version
     r = as_user.get('/version')
     assert r.ok
-    assert r.text == '' # not set yet
+    assert r.json()['database'] == 3
+    api_db.singletons.find_one_and_delete({'_id':'version'})