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

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

Issue 24007002: Add a test for installing Chrome at system level. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 7 years, 3 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_user_not_inuse.prop ('k') | no next file » | 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 13e852883581f3dc99bca7e134b14aa4ac8ae085..ba5396552ef0dd4d1f4d1d4e6ae909b0bf88cd91 100644
--- a/chrome/test/mini_installer/config/config.config
+++ b/chrome/test/mini_installer/config/config.config
@@ -1,25 +1,58 @@
{
"states": [
- ["clean", ["chrome_not_installed.prop", "chrome_not_inuse.prop"]],
- ["chrome_installed_not_inuse", ["chrome_installed.prop",
- "chrome_not_inuse.prop"]],
- ["chrome_installed_inuse", ["chrome_installed.prop", "chrome_inuse.prop"]]
+ ["clean", ["chrome_user_not_installed.prop",
+ "chrome_system_not_installed.prop",
+ "chrome_user_not_inuse.prop",
+ "chrome_system_not_inuse.prop"]],
+ ["chrome_user_installed_not_inuse", ["chrome_user_installed.prop",
+ "chrome_system_not_installed.prop",
+ "chrome_user_not_inuse.prop",
+ "chrome_system_not_inuse.prop"]],
+ ["chrome_system_installed_not_inuse", ["chrome_user_not_installed.prop",
+ "chrome_system_installed.prop",
+ "chrome_user_not_inuse.prop",
+ "chrome_system_not_inuse.prop"]],
+ ["chrome_user_installed_inuse", ["chrome_user_installed.prop",
+ "chrome_system_not_installed.prop",
+ "chrome_user_inuse.prop",
+ "chrome_system_not_inuse.prop"]],
+ ["chrome_system_installed_inuse", ["chrome_user_not_installed.prop",
+ "chrome_system_installed.prop",
+ "chrome_user_not_inuse.prop",
+ "chrome_system_inuse.prop"]]
],
"actions": [
["install_chrome_at_user_level",
- "\"$MINI_INSTALLER\" --chrome --multi-install --do-not-launch-chrome"],
+ "\"$MINI_INSTALLER\" --chrome --multi-install --do-not-launch-chrome"],
+ ["install_chrome_at_system_level",
+ "\"$MINI_INSTALLER\" --chrome --multi-install --system-level --do-not-launch-chrome"],
["launch_chrome_at_user_level",
- "python launch_chrome.py \"$LOCAL_APPDATA\\$CHROME_DIR\\Application\\chrome.exe\""],
+ "python launch_chrome.py \"$LOCAL_APPDATA\\$CHROME_DIR\\Application\\chrome.exe\""],
+ ["launch_chrome_at_system_level",
+ "python launch_chrome.py \"$PROGRAM_FILES\\$CHROME_DIR\\Application\\chrome.exe\""],
["quit_chrome_at_user_level",
- "python quit_chrome.py \"$LOCAL_APPDATA\\$CHROME_DIR\\Application\\chrome.exe\""],
- ["uninstall_chrome",
- "python uninstall_chrome.py --chrome-long-name=\"$CHROME_LONG_NAME\""]
+ "python quit_chrome.py \"$LOCAL_APPDATA\\$CHROME_DIR\\Application\\chrome.exe\""],
+ ["quit_chrome_at_system_level",
+ "python quit_chrome.py \"$PROGRAM_FILES\\$CHROME_DIR\\Application\\chrome.exe\""],
+ ["uninstall_chrome_at_user_level",
+ "python uninstall_chrome.py --chrome-long-name=\"$CHROME_LONG_NAME\""],
+ ["uninstall_chrome_at_system_level",
+ "python uninstall_chrome.py --chrome-long-name=\"$CHROME_LONG_NAME\" --system-level"]
],
"tests": [
- ["clean",
- "install_chrome_at_user_level", "chrome_installed_not_inuse",
- "launch_chrome_at_user_level", "chrome_installed_inuse",
- "quit_chrome_at_user_level", "chrome_installed_not_inuse",
- "uninstall_chrome", "clean"]
+ [
+ "clean",
+ "install_chrome_at_user_level", "chrome_user_installed_not_inuse",
robertshield 2013/09/05 23:20:11 nit: mild preference to name these actions as "ins
+ "launch_chrome_at_user_level", "chrome_user_installed_inuse",
+ "quit_chrome_at_user_level", "chrome_user_installed_not_inuse",
+ "uninstall_chrome_at_user_level", "clean"
+ ],
+ [
+ "clean",
+ "install_chrome_at_system_level", "chrome_system_installed_not_inuse",
+ "launch_chrome_at_system_level", "chrome_system_installed_inuse",
+ "quit_chrome_at_system_level", "chrome_system_installed_not_inuse",
+ "uninstall_chrome_at_system_level", "clean"
+ ]
]
}
« no previous file with comments | « chrome/test/mini_installer/config/chrome_user_not_inuse.prop ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698