| Index: chrome/test/mini_installer/config/config.config
|
| diff --git a/chrome/test/mini_installer/config/config.config b/chrome/test/mini_installer/config/config.config
|
| index b3f9c24b28781447e641d3e64357197d71b11661..286fb03bcdaf00cc97dde79ca385a53567769ae1 100644
|
| --- a/chrome/test/mini_installer/config/config.config
|
| +++ b/chrome/test/mini_installer/config/config.config
|
| @@ -59,19 +59,43 @@
|
| "chrome_canary_not_inuse.prop",
|
| "chrome_system_inuse.prop"]],
|
| ["no_chrome_user", ["chrome_user_killed.prop"]],
|
| - ["no_chrome_user_binaries", ["chrome_user_binaries_killed.prop"]]
|
| + ["no_chrome_user_binaries", ["chrome_user_binaries_killed.prop"]],
|
| + ["chrome_user_updated_not_inuse", ["chrome_user_updated.prop",
|
| + "chrome_canary_not_installed.prop",
|
| + "chrome_system_not_installed.prop",
|
| + "chrome_user_not_inuse.prop",
|
| + "chrome_canary_not_inuse.prop",
|
| + "chrome_system_not_inuse.prop"]],
|
| + ["chrome_canary_updated_not_inuse", ["chrome_user_not_installed.prop",
|
| + "chrome_canary_updated.prop",
|
| + "chrome_system_not_installed.prop",
|
| + "chrome_user_not_inuse.prop",
|
| + "chrome_canary_not_inuse.prop",
|
| + "chrome_system_not_inuse.prop"]],
|
| + ["chrome_system_updated_not_inuse", ["chrome_user_not_installed.prop",
|
| + "chrome_canary_not_installed.prop",
|
| + "chrome_system_updated.prop",
|
| + "chrome_user_not_inuse.prop",
|
| + "chrome_canary_not_inuse.prop",
|
| + "chrome_system_not_inuse.prop"]]
|
| ],
|
| "actions": [
|
| ["delete_user_chrome_lastrun",
|
| "reg.exe delete \"HKEY_CURRENT_USER\\$CHROME_CLIENT_STATE_KEY\" /v lastrun /f /reg:32"],
|
| ["install_chrome_user",
|
| "\"$MINI_INSTALLER\" --chrome --multi-install --verbose-logging --do-not-launch-chrome"],
|
| + ["update_chrome_user",
|
| + "\"$NEXT_VERSION_MINI_INSTALLER\" --multi-install --verbose-logging --do-not-launch-chrome"],
|
| ["install_chrome_canary",
|
| "\"$MINI_INSTALLER\" --chrome-sxs --verbose-logging --do-not-launch-chrome"],
|
| + ["update_chrome_canary",
|
| + "\"$NEXT_VERSION_MINI_INSTALLER\" --chrome-sxs --verbose-logging --do-not-launch-chrome"],
|
| ["install_chrome_single_user",
|
| "\"$MINI_INSTALLER\" --verbose-logging --do-not-launch-chrome"],
|
| ["install_chrome_system",
|
| "\"$MINI_INSTALLER\" --chrome --multi-install --verbose-logging --system-level --do-not-launch-chrome"],
|
| + ["update_chrome_system",
|
| + "\"$NEXT_VERSION_MINI_INSTALLER\" --multi-install --verbose-logging --system-level --do-not-launch-chrome"],
|
| ["kill_user_binaries",
|
| "reg.exe delete \"HKEY_CURRENT_USER\\$BINARIES_UPDATE_REGISTRY_SUBKEY\" /v pv /f /reg:32"],
|
| ["kill_user_chrome",
|
| @@ -180,6 +204,16 @@
|
| ]
|
| },
|
| {
|
| + "name": "ChromeUserLevelUpdate",
|
| + "description": "Verifies that multi-install user-level Chrome can be updated.",
|
| + "traversal": [
|
| + "no_pv",
|
| + "install_chrome_user", "chrome_user_installed_not_inuse",
|
| + "update_chrome_user", "chrome_user_updated_not_inuse",
|
| + "uninstall_chrome_user", "clean"
|
| + ]
|
| + },
|
| + {
|
| "name": "ChromeCanary",
|
| "description": "Verifies that Chrome SxS can be installed and uninstalled.",
|
| "condition": "$SUPPORTS_SXS",
|
| @@ -190,6 +224,17 @@
|
| ]
|
| },
|
| {
|
| + "name": "ChromeCanaryUpdate",
|
| + "description": "Verifies that Chrome SxS can be updated.",
|
| + "condition": "$SUPPORTS_SXS",
|
| + "traversal": [
|
| + "no_pv",
|
| + "install_chrome_canary", "chrome_canary_installed_not_inuse",
|
| + "update_chrome_canary", "chrome_canary_updated_not_inuse",
|
| + "uninstall_chrome_canary", "clean"
|
| + ]
|
| + },
|
| + {
|
| "name": "ChromeSystemLevel",
|
| "description": "Verifies that multi-install system-level Chrome can be installed and uninstalled.",
|
| "traversal": [
|
| @@ -199,6 +244,16 @@
|
| ]
|
| },
|
| {
|
| + "name": "ChromeSystemLevelUpdate",
|
| + "description": "Verifies that multi-install system-level Chrome can be updated.",
|
| + "traversal": [
|
| + "no_pv",
|
| + "install_chrome_system", "chrome_system_installed_not_inuse",
|
| + "update_chrome_system", "chrome_system_updated_not_inuse",
|
| + "uninstall_chrome_system", "clean"
|
| + ]
|
| + },
|
| + {
|
| "name": "ChromeUserLevelWithCanary",
|
| "description": "Verifies that multi-install user-level Chrome and Chrome SxS can be installed simultaneously.",
|
| "condition": "$SUPPORTS_SXS",
|
|
|