Merge pull request launchableinc#194 from launchableinc/win32

Windows support

Author: ninjinkun

.github/workflows/python-package.yml

@@ -12,9 +12,10 @@ on:
 jobs:
   build:
 
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
+        os: [ubuntu-latest, windows-latest]
         python-version: [3.5, 3.6, 3.7, 3.8, 3.9]
 
     steps:

launchable/commands/record/case_event.py

@@ -1,5 +1,6 @@
 import datetime
 import os
+import sys
 from typing import Callable, Dict
 from junitparser import Failure, Error, Skipped, TestCase, TestSuite # type: ignore
 from ...testpath import TestPath
@@ -52,10 +53,17 @@ def from_case_and_suite(cls, path_builder: TestPathBuilder, case: TestCase, suit
                 break
             elif isinstance(r, Skipped):
                 status = CaseEvent.TEST_SKIPPED
+        
+        def path_canonicalizer(test_path: TestPath) -> TestPath:
+            if sys.platform == "win32":
+                for p in test_path:
+                    p['name'] = p['name'].replace("\\", "/")
+                
+            return test_path
 
         return {
             "type": cls.EVENT_TYPE,
-            "testPath": path_builder(case, suite, report_file),
+            "testPath": path_canonicalizer(path_builder(case, suite, report_file)),
             "duration": case.time,
             "status": status,
             "stdout": case._elem.attrib.get("system-out") or "",

launchable/test_runners/bazel.py

@@ -1,5 +1,6 @@
 import os
 from os.path import join
+from pathlib import Path
 
 import click
 from junitparser import TestCase, TestSuite # type: ignore
@@ -32,17 +33,17 @@ def record_tests(client, workspace):
     """
     Takes Bazel workspace, then report all its test results
     """
-    base = join(workspace, 'bazel-testlogs')
-    if not os.path.exists(base):
-        exit("No such directory: %s" % base)
+    base = Path(workspace).joinpath('bazel-testlogs').resolve()
+    if not base.exists():
+        exit("No such directory: %s" % str(base))
 
     default_path_builder = client.path_builder
 
     def f(case: TestCase, suite: TestSuite, report_file: str) -> TestPath:
         # In Bazel, report path name contains package & target.
         # for example, for //foo/bar:zot, the report file is at bazel-testlogs/foo/bar/zot/test.xml
         # TODO: robustness
-        pkgNtarget = report_file[len(base)+1:-len("/test.xml")]
+        pkgNtarget = report_file[len(str(base))+1:-len("/test.xml")]
 
         # last path component is the target, the rest is package
         # TODO: does this work correctly when on Windows?

launchable/utils/session.py

@@ -1,6 +1,5 @@
-import click
 import os
-import json
+import sys
 from pathlib import Path
 import shutil
 from typing import Optional
@@ -19,13 +18,20 @@ def _session_file_path(build_name: str) -> Path:
     return _session_file_dir() / (hashlib.sha1("{}:{}".format(build_name, _get_session_id()).encode()).hexdigest() + ".txt")
 
 
-def _get_session_id():
-    id = os.getsid(os.getpid())
+def _get_session_id() -> str:
+    if sys.platform == "win32":
+        import wmi # type: ignore
+        c = wmi.WMI()
+        wql = "Associators of {{Win32_Process='{}'}} Where Resultclass = Win32_LogonSession Assocclass = Win32_SessionProcess".format(os.getpid())
+        res = c.query(wql)
+        id = res[0].LogonId
+    else:
+        id = str(os.getsid(os.getpid()))
 
     # CircleCI changes unix session id each steps, so set non change variable
     # https://circleci.com/docs/2.0/env-vars/#built-in-environment-variables
     if os.environ.get("CIRCLECI") is not None:
-        id = os.environ.get("CIRCLE_WORKFLOW_ID")
+        id = os.environ.get("CIRCLE_WORKFLOW_ID") or ""
 
     return id
 
@@ -67,7 +73,14 @@ def clean_session_files(days_ago: int = 0) -> None:
         for child in _session_file_dir().iterdir():
             file_created = datetime.datetime.fromtimestamp(
                 child.stat().st_mtime)
-            clean_date = datetime.datetime.now() - datetime.timedelta(days=days_ago)
+
+            if sys.platform == "win32":
+                # Windows sometimes misses to delete session files at Unit Test
+                microseconds = -10
+            else:
+                microseconds = 0
+
+            clean_date = datetime.datetime.now() - datetime.timedelta(days=days_ago, microseconds=microseconds)
             if file_created < clean_date:
                 child.unlink()
 

setup.cfg

@@ -22,6 +22,7 @@ install_requires =
     junitparser>=2.0.0
     setuptools
     more_itertools
+    wmi;platform_system=='Windows'
 python_requires = >=3.4
 
 [options.entry_points]

tests/cli_test_case.py

@@ -78,7 +78,6 @@ def assert_json_orderless_equal(self, a, b):
         """
         Compare two JSON trees ignoring orders of items in list & dict
         """
-
         def tree_sorted(obj):
             if isinstance(obj, dict):
                 return sorted((k, tree_sorted(v)) for k, v in obj.items())

tests/commands/record/test_tests.py

@@ -1,6 +1,7 @@
 from pathlib import Path
 import responses # type: ignore
 import gzip
+import sys
 from tests.cli_test_case import CliTestCase
 
 
@@ -12,8 +13,15 @@ def test_filename_in_error_message(self):
         broken_xml = str(Path(__file__).parent.joinpath('../../data/broken_xml/broken.xml').resolve())
         result = self.cli('record', 'tests', '--build', self.build_name, 'file', normal_xml, broken_xml)
 
+        def remove_backslash(input: str) -> str:
+            # Hack for Windowns. They containts double escaped backslash such as \\\\
+            if sys.platform == "win32":
+                return input.replace("\\", "")
+            else:
+                return input
+
         # making sure the offending file path name is being printed.
-        self.assertIn(broken_xml, result.output)
+        self.assertIn(remove_backslash(broken_xml), remove_backslash(result.output))
 
         # normal.xml
         self.assertIn('open_class_user_test.rb', gzip.decompress(b''.join(responses.calls[1].request.body)).decode())

tests/test_runners/test_gradle.py

@@ -6,6 +6,7 @@
 from tests.cli_test_case import CliTestCase
 from launchable.utils.http_client import get_base_url
 import tempfile
+import os
 from tests.helper import ignore_warnings
 
 
@@ -31,8 +32,7 @@ def test_subset_rest(self):
         responses.replace(responses.POST, "{}/intake/organizations/{}/workspaces/{}/subset".format(get_base_url(), self.organization, self.workspace),
                           json={'testPaths': [[{'type': 'class', 'name': 'com.launchableinc.rocket_car_gradle.App2Test'}], [{'type': 'class', 'name': 'com.launchableinc.rocket_car_gradle.AppTest'}], [{'type': 'class', 'name': 'com.launchableinc.rocket_car_gradle.utils.UtilsTest'}]]}, status=200)
 
-        rest = tempfile.NamedTemporaryFile()
-
+        rest = tempfile.NamedTemporaryFile(delete=False)
         result = self.cli('subset', '--target', '10%', '--build',
                           self.build_name, '--rest', rest.name, 'gradle', str(self.test_files_dir.joinpath('java/app/src/test/java').resolve()))
 
@@ -41,6 +41,8 @@ def test_subset_rest(self):
             '\n'), "--tests com.launchableinc.rocket_car_gradle.App2Test --tests com.launchableinc.rocket_car_gradle.AppTest --tests com.launchableinc.rocket_car_gradle.utils.UtilsTest")
         self.assertEqual(rest.read().decode(
         ), '--tests com.launchableinc.rocket_car_gradle.sub.App3Test')
+        rest.close()
+        os.unlink(rest.name)
 
     @responses.activate
     def test_record_test_gradle(self):