Merge branch 'GPII-1094'

* GPII-1094: GPII-1094: Readded a verifySettings for the cursor solution, as it uses SPI for launching GPII-1094: Cleaned up code, removed checks from unecessary places GPII-1094: Removed some erroneously added changes to some of the testData files GPII-1094: Added verifySettings option to the relevant solutions registry entries. The system will now do the retrying or not depending on that option Mock stuff for testing things on mac
colinbdclark · Mar 1, 2015 · 90af7ed · 90af7ed
2 parents 9814354 + b18a8c4
commit 90af7ed
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 8 deletions.
diff --git a/gpii/node_modules/lifecycleManager/src/LifecycleManager.js b/gpii/node_modules/lifecycleManager/src/LifecycleManager.js
diff --git a/gpii/node_modules/settingsHandlers/src/settingsHandlerUtilities.js b/gpii/node_modules/settingsHandlers/src/settingsHandlerUtilities.js
diff --git a/testData/solutions/win32.json b/testData/solutions/win32.json
@@ -801,7 +801,8 @@
                     "pvParam": {
                         "type": "struct",
                         "name": "HIGHCONTRAST"
-                    }
+                    },
+                    "verifySettings": true
                 },
                 "capabilities": [
                     "display.screenEnhancement.-provisional-highContrastEnabled",
@@ -853,7 +854,8 @@
                     "uiParam": 0,
                     "pvParam": {
                         "type": "UINT"
-                    }
+                    },
+                    "verifySettings": true
                 },
                 "capabilities": [
                     "display.screenEnhancement.mouseTrailing",
@@ -919,7 +921,8 @@
                         "SizeWE": "REG_SZ",
                         "UpArrow": "REG_SZ",
                         "Wait": "REG_SZ"
-                    }
+                    },
+                    "verifySettings": true
                 },
                 "capabilities": [
                     "display.screenEnhancement.cursorSize",