- backport switch to GHA Windows testing

zopefoundation · Jun 8, 2021 · cfe41b5 · cfe41b5
1 parent f4bd4dc
commit cfe41b5
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 32 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -28,7 +28,7 @@ max_line_length = off
 # 4 space indentation
 indent_size = 4
 
-[*.{yml,zpt,pt,dtml}]
+[*.{yml,zpt,pt,dtml,zcml}]
 # 2 space indentation
 indent_size = 2
 

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -8,11 +8,18 @@ on:
   pull_request:
   schedule:
     - cron: '0 12 * * 0'  # run once a week on Sunday
+  # Allow to run this workflow manually from the Actions tab
+  workflow_dispatch:
 
 jobs:
   build:
     strategy:
+      # We want to see all failures:
+      fail-fast: false
       matrix:
+        os:
+        - ubuntu
+        - windows
         config:
         # [Python version, tox env]
         - ["3.8",   "lint"]
@@ -24,9 +31,13 @@ jobs:
         - ["3.8",   "py38"]
         - ["3.8",   "docs"]
         - ["3.8",   "coverage"]
+        exclude:
+          - { os: windows, config: ["3.8",   "lint"] }
+          - { os: windows, config: ["3.8",   "docs"] }
+          - { os: windows, config: ["3.8",   "coverage"] }
 
-    runs-on: ubuntu-latest
-    name: ${{ matrix.config[1] }}
+    runs-on: ${{ matrix.os }}-latest
+    name: ${{ matrix.os }}-${{ matrix.config[1] }}
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -4,7 +4,6 @@ include *.rst
 include *.txt
 include buildout.cfg
 include tox.ini
-include appveyor.yml
 
 recursive-include docs *.bat
 recursive-include docs *.py

diff --git a/appveyor.yml b/appveyor.yml
diff --git a/src/Products/Five/browser/tests/pages.txt b/src/Products/Five/browser/tests/pages.txt
@@ -110,9 +110,8 @@ Test access to ``context`` from ZPTs:
 Test macro access from ZPT pages:
 
   >>> view = self.folder.unrestrictedTraverse('testoid/seagull.html')
-  >>> view() == ('<html><head><title>bird macro</title></head>'
-  ...            '<body>Color: gray</body></html>\n')
-  True
+  >>> print(view())
+  <html><head><title>bird macro</title></head><body>Color: gray</body></html>
 
 test_zpt_things:
 

diff --git a/src/Products/Five/browser/tests/test_pagetemplatefile.py b/src/Products/Five/browser/tests/test_pagetemplatefile.py
@@ -132,7 +132,7 @@ def test___call___no_previous_content_type(self):
         view = self._makeView(context, request)
         vptf = self._makeOne('templates/dirpage1.pt')
         body = vptf(view)
-        self.assertEqual(body, DIRPAGE1)
+        self.assertEqual(body.replace('\r\n', '\n'), DIRPAGE1)
         self.assertEqual(response._headers['Content-Type'], 'text/html')
 
     def test___call___w_previous_content_type(self):

diff --git a/src/Zope2/App/tests/test_safe_formatter.py b/src/Zope2/App/tests/test_safe_formatter.py
@@ -186,7 +186,7 @@ def test_cook_zope3_page_templates_normal(self):
         # Need to pass a namespace.
         namespace = {'context': self.app}
         self.assertEqual(
-            pt.pt_render(namespace).strip(),
+            pt.pt_render(namespace).strip().replace('\r\n', '\n'),
             u'<p>&lt;application at &gt;</p>\n'
             u'<p>&lt;APPLICATION AT &gt;</p>')
 
@@ -201,7 +201,7 @@ def test_cook_zope3_page_templates_using_format(self):
         # template.
         self.app.test_folder_1_.__roles__ = ['Manager']
         self.assertEqual(
-            pt.pt_render(namespace).strip(),
+            pt.pt_render(namespace).strip().replace('\r\n', '\n'),
             u"<p>class of &lt;application at &gt; is "
             u"&lt;class 'ofs.application.application'&gt;</p>\n"
             u"<p>CLASS OF &lt;APPLICATION AT &gt; IS "