Fix servers log artifacts

.github/workflows/package.yml

@@ -108,9 +108,7 @@ jobs:
       with:
         name: test-generic-linux-package-docker-debian-x64-artifacts
         path: |
-          integration/mitmdump.log
-          integration/server.log
-          integration/server-ssl.log
+          ./**/*.log
 
   test-generic-linux-docker-archlinux-x64:
     needs: package-generic-linux-x64
@@ -154,9 +152,7 @@ jobs:
       with:
         name: test-generic-linux-package-docker-archlinux-x64-artifacts
         path: |
-          integration/mitmdump.log
-          integration/server.log
-          integration/server-ssl.log
+          ./**/*.log
 
   test-generic-linux-docker-fedora-x64:
     needs: package-generic-linux-x64
@@ -200,9 +196,7 @@ jobs:
       with:
         name: test-generic-linux-package-docker-fedora-x64-artifacts
         path: |
-          integration/mitmdump.log
-          integration/server.log
-          integration/server-ssl.log
+          ./**/*.log
 
   package-deb-x64:
     runs-on: ubuntu-18.04
@@ -353,6 +347,7 @@ jobs:
       with:
         name: release-windows-x64-artifacts
         path: |
+          .\**\*.log
           .\target\win-package\hurl-*-installer.exe
           .\target\win-package\hurl-*-win64.zip
 

.github/workflows/test.yml

@@ -72,10 +72,9 @@ jobs:
       with:
         name: tests-ubuntu-${{ matrix.rust }}-artifacts
         path: |
-          integration/server.log
-          integration/server-ssl.log
-          integration/report/tests.json
-          integration/report/tests.xml
+          ./**/*.log
+          ./**/report/*.json
+          ./**/report/*.xml
 
   test-ubuntu-x64-18-04:
     runs-on: ubuntu-18.04
@@ -117,10 +116,9 @@ jobs:
       with:
         name: tests-ubuntu-${{ matrix.rust }}-artifacts
         path: |
-          integration/server.log
-          integration/server-ssl.log
-          integration/report/tests.json
-          integration/report/tests.xml
+          ./**/*.log
+          ./**/report/*.json
+          ./**/report/*.xml
 
   test-docker-archlinux-x64:
     runs-on: ubuntu-latest
@@ -154,9 +152,7 @@ jobs:
       with:
         name: tests-archlinux-x64-artifacts
         path: |
-          integration/mitmdump.log
-          integration/server.log
-          integration/server-ssl.log
+          ./**/*.log
 
   test-docker-fedora-x64:
     runs-on: ubuntu-latest
@@ -184,15 +180,17 @@ jobs:
           echo "::group::Tests"
           bin/test/test.sh
           echo "::endgroup::"
+    - name: find artifacts
+      run: |
+        pwd
+        find . -name "*.log"
     - name: Archive production artifacts
       uses: actions/upload-artifact@v3
       if: ${{ always() }}
       with:
         name: tests-fedora-x64-artifacts
         path: |
-          integration/mitmdump.log
-          integration/server.log
-          integration/server-ssl.log
+          ./**/*.log
 
   test-docker-alpine-x64:
     runs-on: ubuntu-latest
@@ -222,15 +220,17 @@ jobs:
           echo "::group::Tests"
           bin/test/test.sh
           echo "::endgroup::"
+    - name: find artifacts
+      run: |
+        pwd
+        find . -name "*.log"
     - name: Archive production artifacts
       uses: actions/upload-artifact@v3
       if: ${{ always() }}
       with:
         name: tests-alpine-x64-artifacts
         path: |
-          integration/mitmdump.log
-          integration/server.log
-          integration/server-ssl.log
+          ./**/*.log
 
   test-macos-x64:
     runs-on: macos-latest
@@ -258,14 +258,17 @@ jobs:
         echo "PATH=${PWD}/target/release:$PATH" >> "${GITHUB_ENV}"
     - name: Integration Tests
       run: bin/test/test_integ.sh
+    - name: find artifacts
+      run: |
+        pwd
+        find . -name "*.log"
     - name: Archive production artifacts
       uses: actions/upload-artifact@v3
       if: ${{ always() }}
       with:
         name: tests-macos-${{ matrix.rust }}-artifacts
         path: |
-          integration/server.log
-          integration/server-ssl.log
+          ./**/*.log
 
   test-windows-x64:
     runs-on: windows-latest
@@ -307,5 +310,5 @@ jobs:
       with:
         name: tests-win64-${{ matrix.rust }}-artifacts
         path: |
-          integration/*.log
+          ./**/*.log
 

CONTRIBUTING.md

@@ -101,4 +101,4 @@ Et voilà 🎉!
 [a test suite]: https://github.com/Orange-OpenSource/hurl/actions
 [an integration test]: https://github.com/Orange-OpenSource/hurl/tree/master/integration/tests_ok
 [Create a new Git branch]: https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-and-deleting-branches-within-your-repository
-[required to be signed]: https://docs.github.com/en/authentication/managing-commit-signature-verification/about-commit-signature-verification
+[required to be signed]: https://docs.github.com/en/authentication/managing-commit-signature-verification/about-commit-signature-verification

integration/report.py

@@ -128,8 +128,12 @@ def check_count(expected_count: int):
 
 
 def main():
-    shutil.rmtree("build", ignore_errors=True)
-    os.mkdir("build")
+    os.makedirs("build", exist_ok=True)
+    shutil.rmtree("build/html", ignore_errors=True)
+    report_files = ["build/tests.json", "build/tests.xml"]
+    for report_file in report_files:
+        if os.path.isfile(report_file):
+            os.remove(report_file)
 
     try:
         count = exec_hurl_files()