From d3b3194a24a3a6800d014546de5b921465891c52 Mon Sep 17 00:00:00 2001
From: "Nir.Tal" <Nir.Tal@aradtec.com>
Date: Sun, 14 Jul 2024 09:45:51 +0300
Subject: [PATCH] fix: update commands

---
 .github/workflows/devRun.yml  | 19 +------------------
 .github/workflows/nightly.yml | 19 +------------------
 2 files changed, 2 insertions(+), 36 deletions(-)

diff --git a/.github/workflows/devRun.yml b/.github/workflows/devRun.yml
index dc19c5440..732643353 100644
--- a/.github/workflows/devRun.yml
+++ b/.github/workflows/devRun.yml
@@ -33,30 +33,13 @@ jobs:
           key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/poetry.lock') }}
       - name: Install Dependencies
         run: poetry install --no-interaction --no-root
-      - name: Install xvfb and fluxbox
-        uses: awalsh128/cache-apt-pkgs-action@latest
-        with:
-          packages: xvfb fluxbox
-          version: 1.0
       - name: Test with pytest
         env:
           EMAIL: ${{ secrets.EMAIL }}
           PASSWORD: ${{ secrets.PASSWORD }}
         run: |
           source .venv/bin/activate
-          SCREEN_WIDTH=1920
-          SCREEN_HEIGHT=1080
-          SCREEN_DEPTH=24
-          SCREEN_DPI=300
-          export GEOMETRY="${SCREEN_WIDTH}""x""${SCREEN_HEIGHT}""x""${SCREEN_DEPTH}"
-          export DISPLAY=:99.0
-          rm -f /tmp/.X*lock
-          xvfb-run --server-num=99 \
-          --listen-tcp \
-          --server-args="-screen 0 ${GEOMETRY} -fbdir /var/tmp -dpi ${SCREEN_DPI} -listen tcp -noreset -ac +extension RANDR" \
-          fluxbox -display :99.0 2&1>/dev/null &
-          exec $@
-          pytest -m devRun --base-url ${{ vars.BASE_URL }}
+          xvfb-run pytest -m devRun --base-url ${{ vars.BASE_URL }}
       - name: Auto-assign reviewers
         uses: kentaro-m/auto-assign-action@v2.0.0
         if: success()
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index da798e00c..0ed3137ed 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -31,30 +31,13 @@ jobs:
           key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/poetry.lock') }}
       - name: Install Dependencies
         run: poetry install --no-interaction --no-root
-      - name: Install xvfb and fluxbox
-        uses: awalsh128/cache-apt-pkgs-action@latest
-        with:
-          packages: xvfb fluxbox
-          version: 1.0
       - name: Test with pytest
         env:
           EMAIL: ${{ secrets.EMAIL }}
           PASSWORD: ${{ secrets.PASSWORD }}
         run: |
           source .venv/bin/activate
-          SCREEN_WIDTH=1920
-          SCREEN_HEIGHT=1080
-          SCREEN_DEPTH=24
-          SCREEN_DPI=300
-          export GEOMETRY="${SCREEN_WIDTH}""x""${SCREEN_HEIGHT}""x""${SCREEN_DEPTH}"
-          export DISPLAY=:99.0
-          rm -f /tmp/.X*lock
-          xvfb-run --server-num=99 \
-          --listen-tcp \
-          --server-args="-screen 0 ${GEOMETRY} -fbdir /var/tmp -dpi ${SCREEN_DPI} -listen tcp -noreset -ac +extension RANDR" \
-          fluxbox -display :99.0 2&1>/dev/null &
-          exec $@
-          pytest -m "not devRun" --base-url ${{ vars.BASE_URL }}
+          xvfb-run pytest -m "not devRun" --base-url ${{ vars.BASE_URL }}
       - name: Link Git Information And Browser Version To Allure Report
         working-directory: allure-results
         if: always()