Fixes some failing tests on windows

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Change Log
 
+
+## 2.47.10 (2019-10-26)
+[Source](https://github.com/repos/nerdvegas/rez/tree/2.47.10) | [Diff](https://github.com/repos/nerdvegas/rez/compare/2.47.9...2.47.10)
+
+Notes
+
+* corrects failing tests in `rez/tests/test_packages.py` on windows
+* adds %SYSTEMROOT% envvar to Python(ActionInterpreter) so `rez/tests/test_context.py` tests pass on windows
+
+
 ## 2.47.9 (2019-10-25)
 [Source](https://github.com/repos/nerdvegas/rez/tree/2.47.9) | [Diff](https://github.com/repos/nerdvegas/rez/compare/2.47.8...2.47.9)
 

src/rez/rex.py

@@ -591,6 +591,7 @@ def apply_environ(self):
                                  "interpreter before using it.")
 
         self.target_environ.update(self.manager.environ)
+        self.target_environ = self.adjust_env_for_platform(self.target_environ)
 
     def get_output(self, style=OutputStyle.file):
         self.apply_environ()
@@ -633,6 +634,7 @@ def error(self, value):
     def subprocess(self, args, **subproc_kwargs):
         if self.manager:
             self.target_environ.update(self.manager.environ)
+        self.target_environ = self.adjust_env_for_platform(self.target_environ)
 
         shell_mode = isinstance(args, basestring)
         return Popen(args,
@@ -684,6 +686,59 @@ def get_key_token(self, key):
         # here because the API requires it.
         return "${%s}" % key
 
+    def adjust_env_for_platform(self, env):
+        """ Make required platform-specific adjustments to env.
+        """
+        if sys.platform.startswith('win'):
+            env = self._add_systemroot_to_env_win32(env)
+        return env.copy()
+
+    def _add_systemroot_to_env_win32(self, env):
+        """ Sets ``%SYSTEMROOT%`` environment variable, if not present.
+
+        Args:
+            env (dict): desired environment variables
+
+        Notes:
+            on windows, python-3.6 startup fails within an environment
+            where it ``%PATH%`` includes python3, but ``%SYSTEMROOT%`` is not
+            present.
+
+            for example.
+
+            .. code-block:: python
+
+                from subprocess import Popen
+                cmds = ['python', '--version']
+
+                # successful
+                Popen(cmds)
+                Popen(cmds, env={'PATH': 'C:\\Python-3.6.5',
+                                 'SYSTEMROOT': 'C:\Windows'})
+
+                # failure
+                Popen(cmds, env={'PATH': 'C:\\Python-3.6.5'})
+
+                #> Fatal Python Error: failed to get random numbers to initialize Python
+
+        """
+        # 'SYSTEMROOT' only relevant on windows
+        if not sys.platform.startswith('win'):
+            return env
+        # 'SYSTEMROOT' unecessary unless 'PATH' is set.
+        if env is None:
+            return env
+        # leave SYSTEMROOT alone if set by user
+        if 'SYSTEMROOT' in env:
+            return env
+        # not enough info to set SYSTEMROOT
+        if 'SYSTEMROOT' not in os.environ:
+            return env
+
+        new_env = env.copy()
+        new_env['SYSTEMROOT'] = os.environ['SYSTEMROOT']
+        return new_env
+
 
 #===============================================================================
 # String manipulation

src/rez/tests/test_packages.py

@@ -3,11 +3,12 @@
 """
 from rez.packages_ import iter_package_families, iter_packages, get_package, \
     create_package, get_developer_package
-from rez.package_resources_ import package_release_keys
-from rez.package_repository import create_memory_package_repository
 from rez.package_py_utils import expand_requirement
+from rez.package_repository import create_memory_package_repository
+from rez.package_resources_ import package_release_keys
 from rez.tests.util import TestBase, TempdirMixin
 from rez.utils.formatting import PackageRequest
+from rez.utils.platform_ import platform_
 from rez.utils.sourcecode import SourceCode
 import unittest
 from rez.vendor.version.version import Version
@@ -119,21 +120,27 @@ def test_2(self):
 
     def test_3(self):
         """check package contents."""
+        def _format_platformpath(path):
+            """ `FileSystemPackageRepository` lower-cases paths for case-insensitive filesystems.
+            """
+            if platform_.has_case_sensitive_filesystem:
+                return path
+            return path.lower()
 
         # a py-based package
         package = get_package("versioned", "3.0")
         expected_data = dict(
             name="versioned",
             version=Version("3.0"),
-            base=os.path.join(self.py_packages_path, "versioned", "3.0"),
+            base=_format_platformpath(os.path.join(self.py_packages_path, "versioned", "3.0")),
             commands=SourceCode('env.PATH.append("{root}/bin")'))
         data = package.validated_data()
         self.assertDictEqual(data, expected_data)
 
         # a yaml-based package
         package = get_package("versioned", "2.0")
-        expected_uri = os.path.join(self.yaml_packages_path,
-                                    "versioned", "2.0", "package.yaml")
+        expected_uri = _format_platformpath(os.path.join(self.yaml_packages_path,
+                                            "versioned", "2.0", "package.yaml"))
         self.assertEqual(package.uri, expected_uri)
 
         # a py-based package with late binding attribute functions
@@ -142,7 +149,7 @@ def test_3(self):
 
         # a 'combined' type package
         package = get_package("multi", "1.0")
-        expected_uri = os.path.join(self.yaml_packages_path, "multi.yaml<1.0>")
+        expected_uri = _format_platformpath(os.path.join(self.yaml_packages_path, "multi.yaml<1.0>"))
         self.assertEqual(package.uri, expected_uri)
         expected_data = dict(
             name="multi",
@@ -153,7 +160,7 @@ def test_3(self):
 
         # a 'combined' type package, with version overrides
         package = get_package("multi", "1.1")
-        expected_uri = os.path.join(self.yaml_packages_path, "multi.yaml<1.1>")
+        expected_uri = _format_platformpath(os.path.join(self.yaml_packages_path, "multi.yaml<1.1>"))
         self.assertEqual(package.uri, expected_uri)
         expected_data = dict(
             name="multi",
@@ -164,7 +171,7 @@ def test_3(self):
 
         # check that visibility of 'combined' packages is correct
         package = get_package("multi", "2.0")
-        expected_uri = os.path.join(self.py_packages_path, "multi.py<2.0>")
+        expected_uri = _format_platformpath(os.path.join(self.py_packages_path, "multi.py<2.0>"))
         self.assertEqual(package.uri, expected_uri)
 
     def test_4(self):
@@ -309,11 +316,17 @@ def preprocess(this, data):
 
     def test_6(self):
         """test variant iteration."""
+        # ensure that differing case doesn't get interpreted as different repos
+        # on case-insensitive platforms (eg windows)
+        base = os.path.join(self.py_packages_path, "variants_py", "2.0")
+        if not platform_.has_case_sensitive_filesystem:
+            base = base.lower()
+
         expected_data = dict(
             name="variants_py",
             version=Version("2.0"),
             description="package with variants",
-            base=os.path.join(self.py_packages_path, "variants_py", "2.0"),
+            base=base,
             requires=[PackageRequest("python-2.7")],
             commands=SourceCode('env.PATH.append("{root}/bin")'))
 

src/rez/utils/_version.py

@@ -1,7 +1,7 @@
 
 
 # Update this value to version up Rez. Do not place anything else in this file.
-_rez_version = "2.47.9"
+_rez_version = "2.47.10"
 
 
 # Copyright 2013-2016 Allan Johns.