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 9326154f38b47986fb402278a5dbf4ea6a898e96..686052685ff940781a58c99ade3b9dcd442f36cc 100644 |
--- a/chrome/test/mini_installer/config/config.config |
+++ b/chrome/test/mini_installer/config/config.config |
@@ -1,196 +1,87 @@ |
{ |
"states": [ |
["no_pv", ["chrome_user_no_pv.prop", |
- "chrome_beta_no_pv.prop", |
"chrome_canary_no_pv.prop", |
- "chrome_dev_no_pv.prop", |
"chrome_system_no_pv.prop"]], |
["clean", ["chrome_user_not_installed.prop", |
- "chrome_beta_not_installed.prop", |
"chrome_canary_not_installed.prop", |
- "chrome_dev_not_installed.prop", |
"chrome_system_not_installed.prop", |
"chrome_user_not_inuse.prop", |
- "chrome_beta_not_inuse.prop", |
"chrome_canary_not_inuse.prop", |
- "chrome_dev_not_inuse.prop", |
"chrome_system_not_inuse.prop"]], |
["chrome_user_installed_not_inuse", ["chrome_user_installed.prop", |
- "chrome_beta_not_installed.prop", |
"chrome_canary_not_installed.prop", |
- "chrome_dev_not_installed.prop", |
"chrome_system_not_installed.prop", |
"chrome_user_not_inuse.prop", |
- "chrome_beta_not_inuse.prop", |
- "chrome_canary_not_inuse.prop", |
- "chrome_dev_not_inuse.prop", |
- "chrome_system_not_inuse.prop"]], |
- ["chrome_beta_installed_not_inuse", ["chrome_user_not_installed.prop", |
- "chrome_beta_installed.prop", |
- "chrome_canary_not_installed.prop", |
- "chrome_dev_not_installed.prop", |
- "chrome_system_not_installed.prop", |
- "chrome_user_not_inuse.prop", |
- "chrome_beta_not_inuse.prop", |
- "chrome_canary_not_inuse.prop", |
- "chrome_dev_not_inuse.prop", |
+ "chrome_canary_not_inuse.prop", |
"chrome_system_not_inuse.prop"]], |
["chrome_canary_installed_not_inuse", ["chrome_user_not_installed.prop", |
- "chrome_beta_not_installed.prop", |
"chrome_canary_installed.prop", |
- "chrome_dev_not_installed.prop", |
"chrome_system_not_installed.prop", |
"chrome_user_not_inuse.prop", |
- "chrome_beta_not_inuse.prop", |
"chrome_canary_not_inuse.prop", |
- "chrome_dev_not_inuse.prop", |
"chrome_system_not_inuse.prop"]], |
- ["chrome_user_and_beta_installed_not_inuse", [ |
- "chrome_user_installed.prop", |
- "chrome_beta_installed.prop", |
- "chrome_canary_not_installed.prop", |
- "chrome_dev_not_installed.prop", |
- "chrome_system_not_installed.prop", |
- "chrome_user_not_inuse.prop", |
- "chrome_beta_not_inuse.prop", |
- "chrome_canary_not_inuse.prop", |
- "chrome_dev_not_inuse.prop", |
- "chrome_system_not_inuse.prop"]], |
- ["chrome_user_and_beta_and_dev_installed_not_inuse", [ |
- "chrome_user_installed.prop", |
- "chrome_beta_installed.prop", |
- "chrome_canary_not_installed.prop", |
- "chrome_dev_installed.prop", |
- "chrome_system_not_installed.prop", |
- "chrome_user_not_inuse.prop", |
- "chrome_beta_not_inuse.prop", |
- "chrome_canary_not_inuse.prop", |
- "chrome_dev_not_inuse.prop", |
- "chrome_system_not_inuse.prop"]], |
- ["chrome_user_and_beta_and_dev_and_canary_installed_not_inuse", [ |
- "chrome_user_installed.prop", |
- "chrome_beta_installed.prop", |
- "chrome_canary_installed.prop", |
- "chrome_dev_installed.prop", |
- "chrome_system_not_installed.prop", |
- "chrome_user_not_inuse.prop", |
- "chrome_beta_not_inuse.prop", |
- "chrome_canary_not_inuse.prop", |
- "chrome_dev_not_inuse.prop", |
- "chrome_system_not_inuse.prop"]], |
- ["chrome_beta_and_dev_and_canary_installed_not_inuse", [ |
- "chrome_user_not_installed.prop", |
- "chrome_beta_installed.prop", |
- "chrome_canary_installed.prop", |
- "chrome_dev_installed.prop", |
- "chrome_system_not_installed.prop", |
- "chrome_user_not_inuse.prop", |
- "chrome_beta_not_inuse.prop", |
- "chrome_canary_not_inuse.prop", |
- "chrome_dev_not_inuse.prop", |
- "chrome_system_not_inuse.prop"]], |
- ["chrome_dev_and_canary_installed_not_inuse", [ |
- "chrome_user_not_installed.prop", |
- "chrome_beta_not_installed.prop", |
- "chrome_canary_installed.prop", |
- "chrome_dev_installed.prop", |
- "chrome_system_not_installed.prop", |
- "chrome_user_not_inuse.prop", |
- "chrome_beta_not_inuse.prop", |
- "chrome_canary_not_inuse.prop", |
- "chrome_dev_not_inuse.prop", |
- "chrome_system_not_inuse.prop"]], |
["chrome_multi_user_installed_not_inuse", |
["chrome_multi_user_installed.prop", |
- "chrome_beta_not_installed.prop", |
"chrome_canary_not_installed.prop", |
- "chrome_dev_not_installed.prop", |
"chrome_system_not_installed.prop", |
"chrome_user_not_inuse.prop", |
- "chrome_beta_not_inuse.prop", |
"chrome_canary_not_inuse.prop", |
- "chrome_dev_not_inuse.prop", |
"chrome_system_not_inuse.prop"]], |
["chrome_system_installed_not_inuse", ["chrome_user_not_installed.prop", |
- "chrome_beta_not_installed.prop", |
"chrome_canary_not_installed.prop", |
- "chrome_dev_not_installed.prop", |
"chrome_system_installed.prop", |
"chrome_user_not_inuse.prop", |
- "chrome_beta_not_inuse.prop", |
"chrome_canary_not_inuse.prop", |
- "chrome_dev_not_inuse.prop", |
"chrome_system_not_inuse.prop"]], |
+ ["chrome_user_and_canary_installed_not_inuse", ["chrome_user_installed.prop", |
+ "chrome_canary_installed.prop", |
+ "chrome_system_not_installed.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_beta_not_installed.prop", |
"chrome_canary_not_installed.prop", |
- "chrome_dev_not_installed.prop", |
"chrome_system_not_installed.prop", |
"chrome_user_inuse.prop", |
- "chrome_beta_not_inuse.prop", |
"chrome_canary_not_inuse.prop", |
- "chrome_dev_not_inuse.prop", |
"chrome_system_not_inuse.prop"]], |
["chrome_canary_installed_inuse", ["chrome_user_not_installed.prop", |
- "chrome_beta_not_installed.prop", |
"chrome_canary_installed.prop", |
- "chrome_dev_not_installed.prop", |
"chrome_system_not_installed.prop", |
"chrome_user_not_inuse.prop", |
- "chrome_beta_not_inuse.prop", |
"chrome_canary_inuse.prop", |
- "chrome_dev_not_inuse.prop", |
"chrome_system_not_inuse.prop"]], |
["chrome_system_installed_inuse", ["chrome_user_not_installed.prop", |
- "chrome_beta_not_installed.prop", |
"chrome_canary_not_installed.prop", |
- "chrome_dev_not_installed.prop", |
"chrome_system_installed.prop", |
"chrome_user_not_inuse.prop", |
- "chrome_beta_not_inuse.prop", |
"chrome_canary_not_inuse.prop", |
- "chrome_dev_not_inuse.prop", |
"chrome_system_inuse.prop"]], |
["no_chrome_user", ["chrome_user_killed.prop"]], |
["no_chrome_user_binaries", ["chrome_user_binaries_killed.prop"]], |
["chrome_user_updated_not_inuse", ["chrome_user_updated.prop", |
- "chrome_beta_not_installed.prop", |
"chrome_canary_not_installed.prop", |
- "chrome_dev_not_installed.prop", |
"chrome_system_not_installed.prop", |
"chrome_user_not_inuse.prop", |
- "chrome_beta_not_inuse.prop", |
"chrome_canary_not_inuse.prop", |
- "chrome_dev_not_inuse.prop", |
"chrome_system_not_inuse.prop"]], |
["chrome_canary_updated_not_inuse", ["chrome_user_not_installed.prop", |
- "chrome_beta_not_installed.prop", |
"chrome_canary_updated.prop", |
- "chrome_dev_not_installed.prop", |
"chrome_system_not_installed.prop", |
"chrome_user_not_inuse.prop", |
- "chrome_beta_not_inuse.prop", |
- "chrome_canary_not_inuse.prop", |
- "chrome_dev_not_inuse.prop", |
+ "chrome_canary_not_inuse.prop", |
"chrome_system_not_inuse.prop"]], |
["chrome_system_updated_not_inuse", ["chrome_user_not_installed.prop", |
- "chrome_beta_not_installed.prop", |
"chrome_canary_not_installed.prop", |
- "chrome_dev_not_installed.prop", |
"chrome_system_updated.prop", |
"chrome_user_not_inuse.prop", |
- "chrome_beta_not_inuse.prop", |
- "chrome_canary_not_inuse.prop", |
- "chrome_dev_not_inuse.prop", |
+ "chrome_canary_not_inuse.prop", |
"chrome_system_not_inuse.prop"]] |
], |
"actions": [ |
- ["install_chrome_beta", |
- "\"$MINI_INSTALLER\" --chrome-beta --verbose-logging --do-not-launch-chrome"], |
["install_chrome_canary", |
"\"$MINI_INSTALLER\" --chrome-sxs --verbose-logging --do-not-launch-chrome"], |
- ["install_chrome_dev", |
- "\"$MINI_INSTALLER\" --chrome-dev --verbose-logging --do-not-launch-chrome"], |
["install_chrome_system", |
"\"$MINI_INSTALLER\" --verbose-logging --system-level --do-not-launch-chrome"], |
["install_chrome_user", |
@@ -213,12 +104,8 @@ |
"python quit_chrome.py \"$PROGRAM_FILES\\$CHROME_DIR\\Application\\chrome.exe\""], |
["quit_chrome_user", |
"python quit_chrome.py \"$LOCAL_APPDATA\\$CHROME_DIR\\Application\\chrome.exe\""], |
- ["uninstall_chrome_beta", |
- "python uninstall_chrome.py --chrome-long-name=\"$CHROME_LONG_NAME_BETA\""], |
["uninstall_chrome_canary", |
"python uninstall_chrome.py --chrome-long-name=\"$CHROME_LONG_NAME_SXS\""], |
- ["uninstall_chrome_dev", |
- "python uninstall_chrome.py --chrome-long-name=\"$CHROME_LONG_NAME_DEV\""], |
["uninstall_chrome_system", |
"python uninstall_chrome.py --chrome-long-name=\"$CHROME_LONG_NAME\" --system-level"], |
["uninstall_chrome_user", |
@@ -251,19 +138,9 @@ |
] |
}, |
{ |
- "name": "ChromeBeta", |
- "description": "Verifies that Chrome Beta can be installed and uninstalled.", |
- "condition": "'$BRAND' == 'Google Chrome'", |
- "traversal": [ |
- "no_pv", |
- "install_chrome_beta", "chrome_beta_installed_not_inuse", |
- "uninstall_chrome_beta", "clean" |
- ] |
- }, |
- { |
"name": "ChromeCanary", |
"description": "Verifies that Chrome SxS can be installed and uninstalled.", |
- "condition": "'$BRAND' == 'Google Chrome'", |
+ "condition": "$SUPPORTS_SXS", |
"traversal": [ |
"no_pv", |
"install_chrome_canary", "chrome_canary_installed_not_inuse", |
@@ -273,7 +150,7 @@ |
{ |
"name": "ChromeCanaryUpdate", |
"description": "Verifies that Chrome SxS can be updated.", |
- "condition": "'$BRAND' == 'Google Chrome'", |
+ "condition": "$SUPPORTS_SXS", |
"traversal": [ |
"no_pv", |
"install_chrome_canary", "chrome_canary_installed_not_inuse", |
@@ -282,16 +159,6 @@ |
] |
}, |
{ |
- "name": "ChromeDev", |
- "description": "Verifies that Chrome Dev can be installed and uninstalled.", |
- "condition": "'$BRAND' == 'Google Chrome'", |
- "traversal": [ |
- "no_pv", |
- "install_chrome_dev", "chrome_dev_installed_not_inuse", |
- "uninstall_chrome_dev", "clean" |
- ] |
- }, |
- { |
"name": "ChromeSystemLevel", |
"description": "Verifies that system-level Chrome can be installed and uninstalled.", |
"traversal": [ |
@@ -311,18 +178,14 @@ |
] |
}, |
{ |
- "name": "AllChromeUserLevel", |
- "description": "Verifies that user-level Chrome, Chrome Beta, Chrome Dev, and Chrome SxS can all be installed simultaneously.", |
- "condition": "'$BRAND' == 'Google Chrome'", |
- "traversal": [ |
- "no_pv", |
- "install_chrome_user", "chrome_user_installed_not_inuse", |
- "install_chrome_beta", "chrome_user_and_beta_installed_not_inuse", |
- "install_chrome_dev", "chrome_user_and_beta_and_dev_installed_not_inuse", |
- "install_chrome_canary", "chrome_user_and_beta_and_dev_and_canary_installed_not_inuse", |
- "uninstall_chrome_user", "chrome_beta_and_dev_and_canary_installed_not_inuse", |
- "uninstall_chrome_beta", "chrome_dev_and_canary_installed_not_inuse", |
- "uninstall_chrome_dev", "chrome_canary_installed_not_inuse", |
+ "name": "ChromeUserLevelWithCanary", |
+ "description": "Verifies that user-level Chrome and Chrome SxS can be installed simultaneously.", |
+ "condition": "$SUPPORTS_SXS", |
+ "traversal": [ |
+ "no_pv", |
+ "install_chrome_user", "chrome_user_installed_not_inuse", |
+ "install_chrome_canary", "chrome_user_and_canary_installed_not_inuse", |
+ "uninstall_chrome_user", "chrome_canary_installed_not_inuse", |
"uninstall_chrome_canary", "clean" |
] |
}, |