Increase timeout and update configs

Author: FreddieAkeroyd

configs/configurations/memory_usage/iocs.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" ?>
 <iocs xmlns="http://epics.isis.rl.ac.uk/schema/iocs/1.0" xmlns:ioc="http://epics.isis.rl.ac.uk/schema/iocs/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
 	<ioc autostart="true" name="COUETTE_01" remotePvPrefix="" restart="true" simlevel="recsim">
 		<macros />
@@ -99,4 +100,4 @@
 		<pvs />
 		<pvsets />
 	</ioc>
-</iocs>
+</iocs>

configs/configurations/memory_usage/meta.xml

@@ -6,5 +6,6 @@
 		<edit>2019-02-04 12:15:24</edit>
 	</edits>
         <isProtected>false</isProtected>
+        <isDynamic>false</isDynamic>
 	<configuresBlockGWAndArchiver>false</configuresBlockGWAndArchiver>
 </meta>

test_memory_usage.py

@@ -30,7 +30,7 @@ def setUp(self) -> None:
         # all tests that interact with anything but genie should try to load
         # a config to ensure that the configurations
         # in the tests are not broken, e.g. by a schema update
-        load_config_if_not_already_loaded(TYPICAL_CONFIG_NAME)
+        load_config_if_not_already_loaded(TYPICAL_CONFIG_NAME, timeout=360)
 
     def get_current_memory_usage(self) -> float:
         """

utilities/utilities.py

@@ -68,7 +68,7 @@ def parameterized_list(cases):
     return return_list
 
 
-def load_config_if_not_already_loaded(config_name):
+def load_config_if_not_already_loaded(config_name, timeout=WAIT_FOR_SERVER_TIMEOUT):
     """
     Load a config by name if it has not already been loaded.
 
@@ -86,7 +86,7 @@ def load_config_if_not_already_loaded(config_name):
 
     g.set_pv("CS:BLOCKSERVER:LOAD_CONFIG", value=compress_and_hex(config_name), is_local=True)
     status_was_busy = False
-    for i in range(WAIT_FOR_SERVER_TIMEOUT):
+    for i in range(timeout):
         status = get_server_status()
         if status_was_busy and status == "":
             break