Remove profiler and split arguments

Tribler · Jun 27, 2023 · 111ac2e · 111ac2e
1 parent f1d2655
commit 111ac2e
Show file tree

Hide file tree

Showing 6 changed files with 74 additions and 124 deletions.
diff --git a/.github/actions/profile/action.yml b/.github/actions/profile/action.yml
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -48,17 +48,11 @@ jobs:
           envFile: ./.github/workflows/vars/pytest.env
           expand: true
 
-      - name: Add --looptime
-        if: runner.os != 'Windows'
-        run: |
-          echo "PYTEST_CORE_ARGUMENTS=${PYTEST_CORE_ARGUMENTS} --looptime" >> $GITHUB_ENV
-          echo "PYTEST_TUNNELS_ARGUMENTS=${PYTEST_TUNNELS_ARGUMENTS} --looptime" >> $GITHUB_ENV
-
       - name: Run Pytest with Coverage
         timeout-minutes: 10
         run: |
-          coverage run --source=./src/tribler/core -p -m pytest ${PYTEST_CORE_ARGUMENTS}
-          coverage run --source=./src/tribler/core -p -m pytest ${PYTEST_TUNNELS_ARGUMENTS}
+          coverage run --source=./src/tribler/core -p -m pytest ${PYTEST_CORE_ARGUMENTS_LINUX}
+          coverage run --source=./src/tribler/core -p -m pytest ${PYTEST_TUNNELS_ARGUMENTS_LINUX}
           coverage combine
           coverage xml
 

diff --git a/.github/workflows/guitest.yml b/.github/workflows/guitest.yml
@@ -13,11 +13,6 @@ on:
         type: string
         required: false
 
-      enable-profiling:
-        default: false
-        type: boolean
-        required: false
-
       ref:
         default: ${{ github.ref }}
         type: string
@@ -78,22 +73,20 @@ jobs:
           envFile: ./.github/workflows/vars/pytest.env
           expand: true
 
-      - name: Add --looptime
-        if: runner.os != 'Windows'
+      - name: Run GUI tests (Win)
+        if: runner.os == 'Windows'
         run: |
-          echo "PYTEST_GUI_ARGUMENTS=${PYTEST_GUI_ARGUMENTS} --looptime" >> $GITHUB_ENV
+          pytest ${PYTEST_GUI_ARGUMENTS_WIN}
 
-      - name: Run GUI tests
-        if: ${{!inputs.enable-profiling}}
+      - name: Run GUI tests (Linux)
+        if: runner.os == 'Linux'
         run: |
-          pytest ${PYTEST_GUI_ARGUMENTS}
+          pytest ${PYTEST_GUI_ARGUMENTS_LINUX}
 
-      - name: Run GUI tests (Profiler)
-        if: ${{inputs.enable-profiling}}
-        uses: ./.github/actions/profile
-        with:
-          artifact_name: guitests_prof.svg
-          arguments: ${PYTEST_GUI_ARGUMENTS}
+      - name: Run GUI tests (Mac)
+        if: runner.os == 'macOS'
+        run: |
+          pytest ${PYTEST_GUI_ARGUMENTS_MAC}
 
       - uses: actions/upload-artifact@v3
         if: always()

diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml
@@ -13,11 +13,6 @@ on:
         type: string
         required: false
 
-      enable_profiling:
-        default: false
-        type: boolean
-        required: false
-
       ref:
         default: ${{ github.ref }}
         type: string
@@ -68,32 +63,32 @@ jobs:
           envFile: ./.github/workflows/vars/pytest.env
           expand: true
 
-      - name: Add --looptime
-        if: runner.os != 'Windows'
+      - name: Run Pytest (Win)
+        if: runner.os == 'Windows'
         run: |
-          echo "PYTEST_CORE_ARGUMENTS=${PYTEST_CORE_ARGUMENTS} --looptime" >> $GITHUB_ENV
-          echo "PYTEST_TUNNELS_ARGUMENTS=${PYTEST_TUNNELS_ARGUMENTS} --looptime" >> $GITHUB_ENV
+          pytest ${PYTEST_CORE_ARGUMENTS_WIN}
 
-      - name: Run Pytest
-        if: ${{!inputs.enable_profiling}}
+      - name: Run Pytest (Linux)
+        if: runner.os == 'Linux'
         run: |
-          pytest ${PYTEST_CORE_ARGUMENTS}
+          pytest ${PYTEST_CORE_ARGUMENTS_LINUX}
 
-      - name: Run Pytest (Profiler)
-        if: ${{inputs.enable_profiling}}
-        uses: ./.github/actions/profile
-        with:
-          artifact_name: pytest_prof.svg
-          arguments: ${PYTEST_CORE_ARGUMENTS}
+      - name: Run Pytest (Mac)
+        if: runner.os == 'macOS'
+        run: |
+          pytest ${PYTEST_CORE_ARGUMENTS_MAC}
 
-      - name: Run Tunnels Tests
-        if: ${{!inputs.enable_profiling}}
+      - name: Run Tunnels Tests (Win)
+        if: runner.os == 'Windows'
         run: |
-          pytest ${PYTEST_TUNNELS_ARGUMENTS}
+          pytest ${PYTEST_TUNNELS_ARGUMENTS_WIN}
 
-      - name: Run Tunnel Tests (Profiler)
-        if: ${{inputs.enable_profiling}}
-        uses: ./.github/actions/profile
-        with:
-          artifact_name: tunneltest_prof.svg
-          arguments: ${PYTEST_TUNNELS_ARGUMENTS}
+      - name: Run Tunnels Tests (Linux)
+        if: runner.os == 'Linux'
+        run: |
+          pytest ${PYTEST_TUNNELS_ARGUMENTS_LINUX}
+
+      - name: Run Tunnels Tests (Mac)
+        if: runner.os == 'macOS'
+        run: |
+          pytest ${PYTEST_TUNNELS_ARGUMENTS_MAC}
diff --git a/.github/workflows/pytest_custom_ipv8.yml b/.github/workflows/pytest_custom_ipv8.yml
@@ -77,18 +77,33 @@ jobs:
           envFile: ./.github/workflows/vars/pytest.env
           expand: true
 
-      - name: Add --looptime
-        if: runner.os != 'Windows'
+      - name: Run Pytest (Win)
+        if: runner.os == 'Windows'
+        run: |
+          pytest ${PYTEST_CORE_ARGUMENTS_WIN}
+
+      - name: Run Pytest (Linux)
+        if: runner.os == 'Linux'
+        run: |
+          pytest ${PYTEST_CORE_ARGUMENTS_LINUX}
+
+      - name: Run Pytest (Mac)
+        if: runner.os == 'macOS'
+        run: |
+          pytest ${PYTEST_CORE_ARGUMENTS_MAC}
+
+      - name: Run Tunnels Tests (Win)
+        if: runner.os == 'Windows'
         run: |
-          echo "PYTEST_CORE_ARGUMENTS=${PYTEST_CORE_ARGUMENTS} --looptime" >> $GITHUB_ENV
-          echo "PYTEST_TUNNELS_ARGUMENTS=${PYTEST_TUNNELS_ARGUMENTS} --looptime" >> $GITHUB_ENV
+          pytest ${PYTEST_TUNNELS_ARGUMENTS_WIN}
 
-      - name: Run Pytest
-        if: ${{!inputs.enable_profiling}}
+      - name: Run Tunnels Tests (Linux)
+        if: runner.os == 'Linux'
         run: |
-          pytest ${PYTEST_CORE_ARGUMENTS}
+          pytest ${PYTEST_TUNNELS_ARGUMENTS_LINUX}
 
-      - name: Run Tunnels Tests
-        if: ${{!inputs.enable_profiling}}
+      - name: Run Tunnels Tests (Mac)
+        if: runner.os == 'macOS'
         run: |
-          pytest ${PYTEST_TUNNELS_ARGUMENTS}
+          pytest ${PYTEST_TUNNELS_ARGUMENTS_MAC}
+          
diff --git a/.github/workflows/vars/pytest.env b/.github/workflows/vars/pytest.env
@@ -1,5 +1,16 @@
-PYTEST_COMMON_ARGUMENTS='--randomly-seed=1 --disable-warnings --reruns 1 --reruns-delay 1 --verbose --durations=3'
+PYTEST_ARGUMENTS='--randomly-seed=1 --disable-warnings --reruns 1 --reruns-delay 1 --verbose --durations=3'
 
-PYTEST_CORE_ARGUMENTS='./src/tribler/core ${PYTEST_COMMON_ARGUMENTS}'
-PYTEST_TUNNELS_ARGUMENTS='./src/tribler/core/components/tunnel/tests/test_full_session --tunneltests ${PYTEST_COMMON_ARGUMENTS}'
-PYTEST_GUI_ARGUMENTS='./src/tribler/gui --guitests ${PYTEST_COMMON_ARGUMENTS}'
+PYTEST_CORE_ARGUMENTS='./src/tribler/core ${PYTEST_ARGUMENTS}'
+PYTEST_CORE_ARGUMENTS_WIN='${PYTEST_CORE_ARGUMENTS}'
+PYTEST_CORE_ARGUMENTS_LINUX='${PYTEST_CORE_ARGUMENTS} --looptime'
+PYTEST_CORE_ARGUMENTS_MAC='${PYTEST_CORE_ARGUMENTS} --looptime'
+
+PYTEST_TUNNELS_ARGUMENTS='./src/tribler/core/components/tunnel/tests/test_full_session --tunneltests ${PYTEST_ARGUMENTS}'
+PYTEST_TUNNELS_ARGUMENTS_WIN='${PYTEST_TUNNELS_ARGUMENTS}'
+PYTEST_TUNNELS_ARGUMENTS_LINUX='${PYTEST_TUNNELS_ARGUMENTS} --looptime'
+PYTEST_TUNNELS_ARGUMENTS_MAC='${PYTEST_TUNNELS_ARGUMENTS} --looptime'
+
+PYTEST_GUI_ARGUMENTS='./src/tribler/gui --guitests ${PYTEST_ARGUMENTS}'
+PYTEST_GUI_ARGUMENTS_WIN='${PYTEST_GUI_ARGUMENTS}'
+PYTEST_GUI_ARGUMENTS_LINUX='${PYTEST_GUI_ARGUMENTS} --looptime'
+PYTEST_GUI_ARGUMENTS_MAC='${PYTEST_GUI_ARGUMENTS} --looptime'