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..2aee7dcde8bb7479eb02dcee99d64ab09aaf7105 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"], |
- ["launch_chrome_at_user_level", |
- "python launch_chrome.py \"$LOCAL_APPDATA\\$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\""] |
+ ["install_chrome_user", |
+ "\"$MINI_INSTALLER\" --chrome --multi-install --do-not-launch-chrome"], |
+ ["install_chrome_system", |
+ "\"$MINI_INSTALLER\" --chrome --multi-install --system-level --do-not-launch-chrome"], |
+ ["launch_chrome_user", |
+ "python launch_chrome.py \"$LOCAL_APPDATA\\$CHROME_DIR\\Application\\chrome.exe\""], |
+ ["launch_chrome_system", |
+ "python launch_chrome.py \"$PROGRAM_FILES\\$CHROME_DIR\\Application\\chrome.exe\""], |
+ ["quit_chrome_user", |
+ "python quit_chrome.py \"$LOCAL_APPDATA\\$CHROME_DIR\\Application\\chrome.exe\""], |
+ ["quit_chrome_system", |
+ "python quit_chrome.py \"$PROGRAM_FILES\\$CHROME_DIR\\Application\\chrome.exe\""], |
+ ["uninstall_chrome_user", |
+ "python uninstall_chrome.py --chrome-long-name=\"$CHROME_LONG_NAME\""], |
+ ["uninstall_chrome_system", |
+ "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"] |
+ [ |
gab
2013/09/06 18:02:20
This makes me think it would be great to be able t
|
+ "clean", |
+ "install_chrome_user", "chrome_user_installed_not_inuse", |
+ "launch_chrome_user", "chrome_user_installed_inuse", |
+ "quit_chrome_user", "chrome_user_installed_not_inuse", |
+ "uninstall_chrome_user", "clean" |
+ ], |
+ [ |
+ "clean", |
+ "install_chrome_system", "chrome_system_installed_not_inuse", |
+ "launch_chrome_system", "chrome_system_installed_inuse", |
+ "quit_chrome_system", "chrome_system_installed_not_inuse", |
+ "uninstall_chrome_system", "clean" |
+ ] |
] |
} |