Chromium Code Reviews| 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..f8c2f35d421be28cae5ab267483c60015d8e856a 100644 |
| --- a/chrome/test/mini_installer/config/config.config |
| +++ b/chrome/test/mini_installer/config/config.config |
| @@ -4,20 +4,26 @@ |
| "chrome_canary_no_pv.prop", |
| "chrome_system_no_pv.prop"]], |
| ["clean", ["chrome_user_not_installed.prop", |
| + "chrome_user_not_updated.prop", |
|
grt (UTC plus 2)
2016/08/01 15:08:16
since this is a pure subset of what chrome_user_no
fdoray
2016/08/01 15:53:13
Done.
|
| "chrome_canary_not_installed.prop", |
| "chrome_system_not_installed.prop", |
| + "chrome_system_not_updated.prop", |
| "chrome_user_not_inuse.prop", |
| "chrome_canary_not_inuse.prop", |
| "chrome_system_not_inuse.prop"]], |
| ["chrome_user_installed_not_inuse", ["chrome_user_installed.prop", |
| + "chrome_user_not_updated.prop", |
| "chrome_canary_not_installed.prop", |
| "chrome_system_not_installed.prop", |
| + "chrome_system_not_updated.prop", |
| "chrome_user_not_inuse.prop", |
| "chrome_canary_not_inuse.prop", |
| "chrome_system_not_inuse.prop"]], |
| ["chrome_canary_installed_not_inuse", ["chrome_user_not_installed.prop", |
| + "chrome_user_not_updated.prop", |
| "chrome_canary_installed.prop", |
| "chrome_system_not_installed.prop", |
| + "chrome_system_not_updated.prop", |
| "chrome_user_not_inuse.prop", |
| "chrome_canary_not_inuse.prop", |
| "chrome_system_not_inuse.prop"]], |
| @@ -25,53 +31,82 @@ |
| ["chrome_single_user_installed.prop", |
| "chrome_canary_not_installed.prop", |
| "chrome_system_not_installed.prop", |
| + "chrome_system_not_updated.prop", |
| "chrome_user_not_inuse.prop", |
| "chrome_canary_not_inuse.prop", |
| "chrome_system_not_inuse.prop"]], |
| ["chrome_system_installed_not_inuse", ["chrome_user_not_installed.prop", |
| + "chrome_user_not_updated.prop", |
| "chrome_canary_not_installed.prop", |
| "chrome_system_installed.prop", |
| + "chrome_system_not_updated.prop", |
| "chrome_user_not_inuse.prop", |
| "chrome_canary_not_inuse.prop", |
| "chrome_system_not_inuse.prop"]], |
| ["chrome_user_and_canary_installed_not_inuse", ["chrome_user_installed.prop", |
| + "chrome_user_not_updated.prop", |
| "chrome_canary_installed.prop", |
| "chrome_system_not_installed.prop", |
| + "chrome_system_not_updated.prop", |
| "chrome_user_not_inuse.prop", |
| "chrome_canary_not_inuse.prop", |
| "chrome_system_not_inuse.prop"]], |
| ["chrome_user_installed_inuse", ["chrome_user_installed.prop", |
| + "chrome_user_not_updated.prop", |
| "chrome_canary_not_installed.prop", |
| "chrome_system_not_installed.prop", |
| + "chrome_system_not_updated.prop", |
| "chrome_user_inuse.prop", |
| "chrome_canary_not_inuse.prop", |
| "chrome_system_not_inuse.prop"]], |
| ["chrome_canary_installed_inuse", ["chrome_user_not_installed.prop", |
| + "chrome_user_not_updated.prop", |
| "chrome_canary_installed.prop", |
| "chrome_system_not_installed.prop", |
| + "chrome_system_not_updated.prop", |
| "chrome_user_not_inuse.prop", |
| "chrome_canary_inuse.prop", |
| "chrome_system_not_inuse.prop"]], |
| ["chrome_system_installed_inuse", ["chrome_user_not_installed.prop", |
| + "chrome_user_not_updated.prop", |
| "chrome_canary_not_installed.prop", |
| "chrome_system_installed.prop", |
| + "chrome_system_not_updated.prop", |
| "chrome_user_not_inuse.prop", |
| "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_system_not_updated.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_user_not_updated.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"], |
| ["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 +215,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", |
| @@ -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", |