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

Unified Diff: chrome/test/mini_installer/variable_expander.py

Issue 1929383002: Add mini_installer not-in-use update test. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix syntax error Created 4 years, 4 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/test_installer.py ('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/variable_expander.py
diff --git a/chrome/test/mini_installer/variable_expander.py b/chrome/test/mini_installer/variable_expander.py
index 71dcf8f99b6c9034dd81ee8bf277106fa72bebcd..551bf61b21b445e55f8fadea0ee347eab5ffb6f7 100644
--- a/chrome/test/mini_installer/variable_expander.py
+++ b/chrome/test/mini_installer/variable_expander.py
@@ -56,7 +56,7 @@ def _GetUserSpecificRegistrySuffix():
class VariableExpander:
"""Expands variables in strings."""
- def __init__(self, mini_installer_path):
+ def __init__(self, mini_installer_path, next_version_mini_installer_path):
"""Constructor.
The constructor initializes a variable dictionary that maps variables to
@@ -77,7 +77,11 @@ class VariableExpander:
* $LOCAL_APPDATA: the unquoted path to the Local Application Data
folder.
* $MINI_INSTALLER: the unquoted path to the mini_installer.
- * $MINI_INSTALLER_FILE_VERSION: the file version of the mini_installer.
+ * $MINI_INSTALLER_FILE_VERSION: the file version of $MINI_INSTALLER.
+ * $NEXT_VERSION_MINI_INSTALLER: the unquoted path to a mini_installer
+ whose version is higher than $MINI_INSTALLER.
+ * $NEXT_VERSION_MINI_INSTALLER_FILE_VERSION: the file version of
+ $NEXT_VERSION_MINI_INSTALLER.
* $PROGRAM_FILES: the unquoted path to the Program Files folder.
* $SUPPORTS_SXS: a boolean indicating whether or not SxS installs
are supported by the mini_installer under test.
@@ -88,15 +92,22 @@ class VariableExpander:
* $WINDOWS_VERSION: a 2-tuple representing the current Windows version.
Args:
- mini_installer_path: The path to mini_installer.exe.
+ mini_installer_path: The path to a mini_installer.
+ next_version_mini_installer_path: The path to a mini_installer whose
+ version is higher than |mini_installer_path|.
"""
mini_installer_abspath = os.path.abspath(mini_installer_path)
+ next_version_mini_installer_abspath = os.path.abspath(
+ next_version_mini_installer_path)
windows_major_ver, windows_minor_ver, _, _, _ = win32api.GetVersionEx()
self._variable_mapping = {
'LOCAL_APPDATA': shell.SHGetFolderPath(0, shellcon.CSIDL_LOCAL_APPDATA,
None, 0),
'MINI_INSTALLER': mini_installer_abspath,
'MINI_INSTALLER_FILE_VERSION': _GetFileVersion(mini_installer_abspath),
+ 'NEXT_VERSION_MINI_INSTALLER': next_version_mini_installer_abspath,
+ 'NEXT_VERSION_MINI_INSTALLER_FILE_VERSION': _GetFileVersion(
+ next_version_mini_installer_abspath),
'PROGRAM_FILES': shell.SHGetFolderPath(0, shellcon.CSIDL_PROGRAM_FILES,
None, 0),
'USER_SPECIFIC_REGISTRY_SUFFIX': _GetUserSpecificRegistrySuffix(),
« no previous file with comments | « chrome/test/mini_installer/test_installer.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698