Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7471)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/test/mini_installer/config/config.config

Issue 2802713002: Enable side-by-side beta and dev channels. (Closed)
Patch Set: add missing test stanza for reland Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/mini_installer/config/chrome_dev_not_inuse.prop ('k') | chrome/test/mini_installer/mini_installer_test.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 686052685ff940781a58c99ade3b9dcd442f36cc..18abcf1351c8664c8ffd11984a4b4e72f453b737 100644
--- a/chrome/test/mini_installer/config/config.config
+++ b/chrome/test/mini_installer/config/config.config
@@ -1,87 +1,206 @@
{
"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_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_dev_installed_not_inuse", ["chrome_user_not_installed.prop",
+ "chrome_beta_not_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_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_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_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",
@@ -104,8 +223,12 @@
"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",
@@ -138,9 +261,19 @@
]
},
{
+ "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": "$SUPPORTS_SXS",
+ "condition": "'$BRAND' == 'Google Chrome'",
"traversal": [
"no_pv",
"install_chrome_canary", "chrome_canary_installed_not_inuse",
@@ -150,7 +283,7 @@
{
"name": "ChromeCanaryUpdate",
"description": "Verifies that Chrome SxS can be updated.",
- "condition": "$SUPPORTS_SXS",
+ "condition": "'$BRAND' == 'Google Chrome'",
"traversal": [
"no_pv",
"install_chrome_canary", "chrome_canary_installed_not_inuse",
@@ -159,6 +292,16 @@
]
},
{
+ "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": [
@@ -178,14 +321,18 @@
]
},
{
- "name": "ChromeUserLevelWithCanary",
- "description": "Verifies that user-level Chrome and Chrome SxS can be installed simultaneously.",
- "condition": "$SUPPORTS_SXS",
+ "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_canary", "chrome_user_and_canary_installed_not_inuse",
- "uninstall_chrome_user", "chrome_canary_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",
"uninstall_chrome_canary", "clean"
]
},
« no previous file with comments | « chrome/test/mini_installer/config/chrome_dev_not_inuse.prop ('k') | chrome/test/mini_installer/mini_installer_test.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698