Merge lp:~marcustomlinson/unity-scopes-api/relax-process-timeout into lp:unity-scopes-api

[Marcus Tomlinson]

Up the maximum allowed process timeout to 1min

[lp:~marcustomlinson/unity-scopes-api/relax-process-timeout]

372. By Marcus Tomlinson on 2016-09-06

Up the maximum allowed registry timeout to 1min

373. By Marcus Tomlinson on 2016-09-08

Up locate timeout to 1min

374. By Marcus Tomlinson on 2016-09-08

Merged devel

Unmerged revisions

=== modified file 'CONFIGFILES'
--- CONFIGFILES	2016-02-22 01:29:01 +0000
+++ CONFIGFILES	2016-09-08 07:46:45 +0000
@@ -189,11 +189,11 @@
   in Registry.ini, otherwise invocations on a scope that needs to be activated
   first can fail, even though the activation succeeded.
 
-  Only values in the range 10 to 15000 milliseconds are accepted. (Values outside
+  Only values in the range 10 to 60000 milliseconds are accepted. (Values outside
   this range would either cause locate() to falsely conclude that a scope
   could not be started, or cause an unacceptably long wait time.)
 
-  Only values in the range 10 to 15000 milliseconds are accepted.
+  Only values in the range 10 to 60000 milliseconds are accepted.
 
   The default value is 5000 milliseconds.
 
@@ -202,7 +202,7 @@
   The timeout to be used when invoking a twoway operation on the registry other
   than locate().
 
-  Only values in the range 10 to 15000 milliseconds are accepted.
+  Only values in the range 10 to 60000 milliseconds are accepted.
 
   The default value is 5000 milliseconds.
 
@@ -212,7 +212,7 @@
   on a scope. These methods require more time to execute than other scope methods
   as they read from and write to disk.
 
-  Only values in the range 10 to 15000 milliseconds are accepted.
+  Only values in the range 10 to 60000 milliseconds are accepted.
 
   The default value is 2000 milliseconds.
 
@@ -269,7 +269,7 @@
   or terminate correctly. If a scope does not respond
   within the allotted time, it is killed with SIGKILL.
 
-  Only values in the range 10 to 15000 milliseconds are accepted.
+  Only values in the range 10 to 60000 milliseconds are accepted.
 
   The default value is 4000 milliseconds.
 
 
=== modified file 'include/unity/scopes/testing/MockScope.h'
--- include/unity/scopes/testing/MockScope.h	2015-05-29 10:17:42 +0000
+++ include/unity/scopes/testing/MockScope.h	2016-09-08 07:46:45 +0000
@@ -18,7 +18,9 @@
 
 #pragma once
 
+#include <unity/scopes/ActionMetadata.h>
 #include <unity/scopes/Scope.h>
+#include <unity/scopes/SearchMetadata.h>
 
 #include <unity/scopes/testing/MockObject.h>
 
 
=== modified file 'src/scopes/internal/RegistryConfig.cpp'
--- src/scopes/internal/RegistryConfig.cpp	2015-08-04 04:56:01 +0000
+++ src/scopes/internal/RegistryConfig.cpp	2016-09-08 07:46:45 +0000
@@ -71,9 +71,9 @@
         throw ConfigException(configfile + ": " + scoperunner_path_key + " must be an absolute path");
     }
     process_timeout_ = get_optional_int(registry_config_group, process_timeout_key, DFLT_PROCESS_TIMEOUT);
-    if (process_timeout_ < 10 || process_timeout_ > 15000)
+    if (process_timeout_ < 10 || process_timeout_ > 60000)
     {
-        throw_ex("Illegal value (" + to_string(process_timeout_) + ") for " + process_timeout_key + ": value must be 10-15000 ms");
+        throw_ex("Illegal value (" + to_string(process_timeout_) + ") for " + process_timeout_key + ": value must be 10-60000 ms");
     }
 
     KnownEntries const known_entries = {
 
=== modified file 'src/scopes/internal/zmq_middleware/ZmqConfig.cpp'
--- src/scopes/internal/zmq_middleware/ZmqConfig.cpp	2015-07-01 10:59:49 +0000
+++ src/scopes/internal/zmq_middleware/ZmqConfig.cpp	2016-09-08 07:46:45 +0000
@@ -80,21 +80,21 @@
     }
 
     registry_timeout_ = get_optional_int(zmq_config_group, registry_timeout_key, DFLT_ZMQ_REGISTRY_TIMEOUT);
-    if (registry_timeout_ < 10 || registry_timeout_ > 15000)
+    if (registry_timeout_ < 10 || registry_timeout_ > 60000)
     {
-        throw_ex("Illegal value (" + to_string(registry_timeout_) + ") for " + registry_timeout_key + ": value must be 10-15000");
+        throw_ex("Illegal value (" + to_string(registry_timeout_) + ") for " + registry_timeout_key + ": value must be 10-60000");
     }
 
     locate_timeout_ = get_optional_int(zmq_config_group, locate_timeout_key, DFLT_ZMQ_LOCATE_TIMEOUT);
-    if (locate_timeout_ < 10 || locate_timeout_ > 15000)
+    if (locate_timeout_ < 10 || locate_timeout_ > 60000)
     {
-        throw_ex("Illegal value (" + to_string(locate_timeout_) + ") for " + locate_timeout_key + ": value must be 10-15000");
+        throw_ex("Illegal value (" + to_string(locate_timeout_) + ") for " + locate_timeout_key + ": value must be 10-60000");
     }
 
     child_scopes_timeout_ = get_optional_int(zmq_config_group, child_scopes_timeout_key, DFLT_ZMQ_CHILDSCOPES_TIMEOUT);
-    if (child_scopes_timeout_ < 10 || child_scopes_timeout_ > 15000)
+    if (child_scopes_timeout_ < 10 || child_scopes_timeout_ > 60000)
     {
-        throw_ex("Illegal value (" + to_string(child_scopes_timeout_) + ") for " + child_scopes_timeout_key + ": value must be 10-15000");
+        throw_ex("Illegal value (" + to_string(child_scopes_timeout_) + ") for " + child_scopes_timeout_key + ": value must be 10-60000");
     }
 
     registry_endpoint_dir_ = get_optional_string(zmq_config_group, registry_endpoint_dir_key);