Add test for webservice.merge

tests/test_webservice.py

@@ -4,7 +4,7 @@ from pathlib import Path
 import pytest
 
 sys.path.insert(0, Path(__file__).parent / 'webservice')
-from webservice.webservice import check_files  # noqa
+from webservice.webservice import check_files, merge  # noqa
 
 
 def test_check_files():
@@ -23,3 +23,16 @@ def test_check_files():
     with pytest.raises(PermissionError):
         in_folder = '/gpfs/maxwell/home/achilles'  # arbitrarily chosen
         check_files(in_folder, runs, karabo_das)
+
+
+def test_merge():
+    a = {'some': {'key': {'akey': 'avalue', 'number': 1}}}
+    b = {'some': {'key': {'anotherkey': 'anothervalue', 'number': 5}},
+         'completely': 'different'}
+
+    ret = merge(a, b)
+    expected = {'some': {'key': {'akey': 'avalue',
+                                 'anotherkey': 'anothervalue',
+                                 'number': 1}},
+                'completely': 'different'}
+    assert ret == expected