update: rewrited env's, qtest include and clear clients in some tests

2026-05-08 14:33:23 +00:00 · 2026-04-28 16:46:58 +03:00
parent 8fc9fb87fb
commit 1238920b60
19 changed files with 64 additions and 207 deletions
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -743,6 +743,16 @@ jobs:

    env:
      QT_VERSION: 6.10.1
+      TEST_SELF_HOSTED_CONFIG: ${{ secrets.TEST_SELF_HOSTED_CONFIG }}
+      TEST_APP_PATH: ${{ secrets.TEST_APP_PATH }}
+      TEST_SITES_LIST_PATH: ${{ secrets.TEST_SITES_LIST_PATH }}
+      TEST_DNS_LIST_PATH: ${{ secrets.TEST_DNS_LIST_PATH }}
+      TEST_EXPORT_PATH: ${{ secrets.TEST_EXPORT_PATH }}
+      TEST_KEY_VMESS_NEW: ${{ secrets.TEST_KEY_VMESS_NEW }}
+      TEST_KEY_VMESS: ${{ secrets.TEST_KEY_VMESS }}
+      TEST_KEY_TROJAN: ${{ secrets.TEST_KEY_TROJAN }}
+      TEST_KEY_SS: ${{ secrets.TEST_KEY_SS }}
+      TEST_KEY_SSD: ${{ secrets.TEST_KEY_SSD }}

    steps:
    - name: 'Get sources'
@@ -812,6 +822,16 @@ jobs:

    env:
      QT_VERSION: 6.10.1
+      TEST_SELF_HOSTED_CONFIG: ${{ secrets.TEST_SELF_HOSTED_CONFIG }}
+      TEST_APP_PATH: ${{ secrets.TEST_APP_PATH }}
+      TEST_SITES_LIST_PATH: ${{ secrets.TEST_SITES_LIST_PATH }}
+      TEST_DNS_LIST_PATH: ${{ secrets.TEST_DNS_LIST_PATH }}
+      TEST_EXPORT_PATH: ${{ secrets.TEST_EXPORT_PATH }}
+      TEST_KEY_VMESS_NEW: ${{ secrets.TEST_KEY_VMESS_NEW }}
+      TEST_KEY_VMESS: ${{ secrets.TEST_KEY_VMESS }}
+      TEST_KEY_TROJAN: ${{ secrets.TEST_KEY_TROJAN }}
+      TEST_KEY_SS: ${{ secrets.TEST_KEY_SS }}
+      TEST_KEY_SSD: ${{ secrets.TEST_KEY_SSD }}

    steps:
    - name: 'Get sources'
@@ -871,6 +891,16 @@ jobs:

    env:
      QT_VERSION: 6.10.1
+      TEST_SELF_HOSTED_CONFIG: ${{ secrets.TEST_SELF_HOSTED_CONFIG }}
+      TEST_APP_PATH: ${{ secrets.TEST_APP_PATH }}
+      TEST_SITES_LIST_PATH: ${{ secrets.TEST_SITES_LIST_PATH }}
+      TEST_DNS_LIST_PATH: ${{ secrets.TEST_DNS_LIST_PATH }}
+      TEST_EXPORT_PATH: ${{ secrets.TEST_EXPORT_PATH }}
+      TEST_KEY_VMESS_NEW: ${{ secrets.TEST_KEY_VMESS_NEW }}
+      TEST_KEY_VMESS: ${{ secrets.TEST_KEY_VMESS }}
+      TEST_KEY_TROJAN: ${{ secrets.TEST_KEY_TROJAN }}
+      TEST_KEY_SS: ${{ secrets.TEST_KEY_SS }}
+      TEST_KEY_SSD: ${{ secrets.TEST_KEY_SSD }}

    steps:
      - name: 'Setup xcode'
@@ -921,86 +951,3 @@ jobs:

          ctest --test-dir build/client --output-on-failure

-# ------------------------------------------------------
-
-  Test-Android:
-    runs-on: ubuntu-latest
-
-    env:
-      QT_VERSION: 6.10.1
-      QT_MODULES: 'qtremoteobjects qt5compat qtimageformats qtshadertools'
-
-    steps:
-      - name: 'Get sources'
-        uses: actions/checkout@v4
-        with:
-          submodules: 'true'
-          fetch-depth: 10
-      
-      - name: 'Install Qt (host)'
-        uses: jurplel/install-qt-action@v4
-        with:
-          version: ${{ env.QT_VERSION }}
-          host: 'linux'
-          target: 'desktop'
-          arch: 'linux_gcc_64'
-          modules: ${{ env.QT_MODULES }}
-          dir: ${{ runner.temp }}
-          set-env: 'true'
-      
-      - name: 'Install Qt (android arm64)'
-        uses: jurplel/install-qt-action@v4
-        with:
-          version: ${{ env.QT_VERSION }}
-          host: 'linux'
-          target: 'android'
-          arch: 'android_arm64_v8a'
-          modules: ${{ env.QT_MODULES }}
-          dir: ${{ runner.temp }}
-          set-env: 'true'
-
-      - name: 'Setup Java'
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'temurin'
-          java-version: '17'
-
-      - name: 'Setup Android NDK'
-        id: setup-ndk
-        uses: nttld/setup-ndk@v1
-        with:
-          ndk-version: 'r26b'
-      
-      - name: 'Configure Android build'
-        run: |
-          QT_ANDROID=${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/android_arm64_v8a
-          QT_HOST=${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/gcc_64
-
-          cmake -B build-android -G Ninja \
-            -DCMAKE_BUILD_TYPE=Release \
-            -DCMAKE_TOOLCHAIN_FILE=$QT_ANDROID/lib/cmake/Qt6/qt.toolchain.cmake \
-            -DQT_HOST_PATH=$QT_HOST
-
-      - name: 'Build Android'
-        run: cmake --build build-android
-    
-      - name: 'Configure tests (host)'
-        run: |
-          cmake -B build-host -G Ninja \
-            -DCMAKE_BUILD_TYPE=Release \
-            -DBUILD_TESTING=ON
-
-      - name: 'Build tests'
-        run: cmake --build build-host
-
-      - name: 'Run tests'
-        run: |
-          QT_ROOT=${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/gcc_64
-
-          export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:\
-          $QT_ROOT/lib:\
-          $PWD/client/3rd-prebuilt/deploy-prebuilt/linux/x64
-
-          export QT_QPA_PLATFORM=offscreen
-
-          ctest --test-dir build-host/client --output-on-failure
--- a/client/tests/testAdminSelfHostedExport.cpp
+++ b/client/tests/testAdminSelfHostedExport.cpp
@@ -5,12 +5,7 @@
 #include <QDebug>
 #include <QUuid>
 #include <QSignalSpy>
-
-#ifdef Q_OS_WIN
-    #include <QTest>
-#else
-    #include <QtTest/qtest.h>
-#endif
+#include <QTest>

 #include "core/controllers/coreController.h"
 #include "core/models/serverConfig.h"
--- a/client/tests/testComplexOperations.cpp
+++ b/client/tests/testComplexOperations.cpp
@@ -2,12 +2,7 @@
 #include <QJsonObject>
 #include <QUuid>
 #include <QSignalSpy>
-
-#ifdef Q_OS_WIN
-    #include <QTest>
-#else
-    #include <QtTest/qtest.h>
-#endif
+#include <QTest>

 #include "core/controllers/coreController.h"
 #include "core/models/serverConfig.h"
--- a/client/tests/testDefaultServerChange.cpp
+++ b/client/tests/testDefaultServerChange.cpp
@@ -2,12 +2,7 @@
 #include <QJsonObject>
 #include <QUuid>
 #include <QSignalSpy>
-
-#ifdef Q_OS_WIN
-    #include <QTest>
-#else
-    #include <QtTest/qtest.h>
-#endif
+#include <QTest>

 #include "core/controllers/coreController.h"
 #include "core/models/serverConfig.h"
--- a/client/tests/testGatewayStacks.cpp
+++ b/client/tests/testGatewayStacks.cpp
@@ -2,12 +2,7 @@
 #include <QJsonObject>
 #include <QUuid>
 #include <QSignalSpy>
-
-#ifdef Q_OS_WIN
-    #include <QTest>
-#else
-    #include <QtTest/qtest.h>
-#endif
+#include <QTest>

 #include "core/controllers/coreController.h"
 #include "core/models/serverConfig.h"
--- a/client/tests/testMultipleExports.cpp
+++ b/client/tests/testMultipleExports.cpp
@@ -4,12 +4,7 @@
 #include <QSignalSpy>
 #include <QUuid>
 #include <QProcessEnvironment>
-
-#ifdef Q_OS_WIN
-    #include <QTest>
-#else
-    #include <QtTest/qtest.h>
-#endif
+#include <QTest>

 #include "core/controllers/coreController.h"
 #include "core/models/serverConfig.h"
@@ -28,8 +23,7 @@ private:

    QString getSHAdminConfig()
    {
-        QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
-        return env.value("TEST_SELF_HOSTED_CONFIG");
+        return QProcessEnvironment::systemEnvironment().value("TEST_SELF_HOSTED_CONFIG");
    }

 private slots:
@@ -53,6 +47,10 @@ private slots:
    void cleanupTestCase()
    {
        int serverIndex = m_coreController->m_serversRepository->defaultServerIndex();
+        
+        for (int containerIndex = 1; containerIndex < 7; ++containerIndex)
+            m_coreController->m_installUiController->clearCachedProfile(serverIndex, containerIndex);
+
        m_coreController->m_serversController->removeServer(serverIndex);

        qDebug() << "SERVER REMOVED\n";
--- a/client/tests/testMultipleImports.cpp
+++ b/client/tests/testMultipleImports.cpp
@@ -3,12 +3,7 @@
 #include <QDebug>
 #include <QUuid>
 #include <QSignalSpy>
-
-#ifdef Q_OS_WIN
-    #include <QTest>
-#else
-    #include <QtTest/qtest.h>
-#endif
+#include <QTest>

 #include "core/controllers/coreController.h"
 #include "core/models/serverConfig.h"
--- a/client/tests/testSelfHostedServerSetup.cpp
+++ b/client/tests/testSelfHostedServerSetup.cpp
@@ -4,12 +4,7 @@
 #include <QSignalSpy>
 #include <QProcessEnvironment>
 #include <QDebug>
-
-#ifdef Q_OS_WIN
-    #include <QTest>
-#else
-    #include <QtTest/qtest.h>
-#endif
+#include <QTest>

 #include "core/controllers/coreController.h"
 #include "core/models/serverConfig.h"
--- a/client/tests/testSerialization.cpp
+++ b/client/tests/testSerialization.cpp
@@ -4,12 +4,7 @@
 #include <QProcessEnvironment>
 #include <QSignalSpy>
 #include <QUuid>
-
-#ifdef Q_OS_WIN
-    #include <QTest>
-#else
-    #include <QtTest/qtest.h>
-#endif
+#include <QTest>

 #include "core/controllers/coreController.h"
 #include "core/models/serverConfig.h"
@@ -30,14 +25,12 @@ private:

    QString getSHAdminConfig()
    {
-        QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
-        return env.value("TEST_SELF_HOSTED_CONFIG");
+        return QProcessEnvironment::systemEnvironment().value("TEST_SELF_HOSTED_CONFIG");
    }

    QString getKey(QString name)
    {
-        QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
-        return env.value("TEST_KEY_" + name);
+        return QProcessEnvironment::systemEnvironment().value("TEST_KEY_" + name);
    }

    QJsonObject extractXrayConfig(const QString &data, ConfigTypes configType, const QString &description = "") const
@@ -106,6 +99,10 @@ private slots:
    void cleanupTestCase()
    {
        int serverIndex = m_coreController->m_serversRepository->defaultServerIndex();
+
+        for (int containerIndex = 1; containerIndex < 7; ++containerIndex)
+            m_coreController->m_installUiController->clearCachedProfile(serverIndex, containerIndex);
+
        m_coreController->m_serversController->removeServer(serverIndex);

        qDebug() << "SERVER REMOVED\n";
--- a/client/tests/testServerEdgeCases.cpp
+++ b/client/tests/testServerEdgeCases.cpp
@@ -2,12 +2,7 @@
 #include <QJsonObject>
 #include <QUuid>
 #include <QSignalSpy>
-
-#ifdef Q_OS_WIN
-    #include <QTest>
-#else
-    #include <QtTest/qtest.h>
-#endif
+#include <QTest>

 #include "core/controllers/coreController.h"
 #include "core/models/serverConfig.h"
--- a/client/tests/testServerEdit.cpp
+++ b/client/tests/testServerEdit.cpp
@@ -2,12 +2,7 @@
 #include <QJsonObject>
 #include <QUuid>
 #include <QSignalSpy>
-
-#ifdef Q_OS_WIN
-    #include <QTest>
-#else
-    #include <QtTest/qtest.h>
-#endif
+#include <QTest>

 #include "core/controllers/coreController.h"
 #include "core/models/serverConfig.h"
--- a/client/tests/testServersModelSync.cpp
+++ b/client/tests/testServersModelSync.cpp
@@ -2,12 +2,7 @@
 #include <QJsonObject>
 #include <QUuid>
 #include <QSignalSpy>
-
-#ifdef Q_OS_WIN
-    #include <QTest>
-#else
-    #include <QtTest/qtest.h>
-#endif
+#include <QTest>

 #include "core/controllers/coreController.h"
 #include "core/models/serverConfig.h"
--- a/client/tests/testSettingsSignals.cpp
+++ b/client/tests/testSettingsSignals.cpp
@@ -3,12 +3,7 @@
 #include <QUuid>
 #include <QSignalSpy>
 #include <QLocale>
-
-#ifdef Q_OS_WIN
-    #include <QTest>
-#else
-    #include <QtTest/qtest.h>
-#endif
+#include <QTest>

 #include "core/controllers/coreController.h"
 #include "core/models/serverConfig.h"
--- a/client/tests/testSignalOrder.cpp
+++ b/client/tests/testSignalOrder.cpp
@@ -2,12 +2,7 @@
 #include <QJsonObject>
 #include <QUuid>
 #include <QSignalSpy>
-
-#ifdef Q_OS_WIN
-    #include <QTest>
-#else
-    #include <QtTest/qtest.h>
-#endif
+#include <QTest>

 #include "core/controllers/coreController.h"
 #include "core/models/serverConfig.h"
--- a/client/tests/testUiAllowedDnsModelAndController.cpp
+++ b/client/tests/testUiAllowedDnsModelAndController.cpp
@@ -4,12 +4,7 @@
 #include <QProcessEnvironment>
 #include <QSignalSpy>
 #include <QUuid>
-
-#ifdef Q_OS_WIN
-    #include <QTest>
-#else
-    #include <QtTest/qtest.h>
-#endif
+#include <QTest>

 #include "core/controllers/coreController.h"
 #include "core/models/serverConfig.h"
@@ -28,14 +23,12 @@ private:

    QString getPath()
    {
-        QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
-        return env.value("TEST_PATH");
+        return QProcessEnvironment::systemEnvironment().value("TEST_DNS_LIST_PATH");
    }

    QString getExportPath()
    {
-        QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
-        return env.value("TEST_EXPORT_PATH");
+        return QProcessEnvironment::systemEnvironment().value("TEST_EXPORT_PATH");
    }

 private slots:
--- a/client/tests/testUiAppSTModelAndController.cpp
+++ b/client/tests/testUiAppSTModelAndController.cpp
@@ -4,12 +4,7 @@
 #include <QProcessEnvironment>
 #include <QSignalSpy>
 #include <QUuid>
-
-#ifdef Q_OS_WIN
-    #include <QTest>
-#else
-    #include <QtTest/qtest.h>
-#endif
+#include <QTest>

 #include "core/controllers/coreController.h"
 #include "core/models/serverConfig.h"
@@ -28,8 +23,7 @@ private:

    QString getPath()
    {
-        QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
-        return env.value("TEST_PATH");
+        return QProcessEnvironment::systemEnvironment().value("TEST_APP_PATH");
    }

 private slots:
--- a/client/tests/testUiLanguageModelAndController.cpp
+++ b/client/tests/testUiLanguageModelAndController.cpp
@@ -4,12 +4,7 @@
 #include <QProcessEnvironment>
 #include <QSignalSpy>
 #include <QUuid>
-
-#ifdef Q_OS_WIN
-    #include <QTest>
-#else
-    #include <QtTest/qtest.h>
-#endif
+#include <QTest>

 #include "core/controllers/coreController.h"
 #include "core/models/serverConfig.h"
--- a/client/tests/testUiServersModelAndController.cpp
+++ b/client/tests/testUiServersModelAndController.cpp
@@ -5,12 +5,7 @@
 #include <QUuid>
 #include <QSignalSpy>
 #include <QModelIndex>
-
-#ifdef Q_OS_WIN
-    #include <QTest>
-#else
-    #include <QtTest/qtest.h>
-#endif
+#include <QTest>

 #include "core/controllers/coreController.h"
 #include "core/models/serverConfig.h"
--- a/client/tests/testUiSitesModelAndController.cpp
+++ b/client/tests/testUiSitesModelAndController.cpp
@@ -4,12 +4,7 @@
 #include <QProcessEnvironment>
 #include <QSignalSpy>
 #include <QUuid>
-
-#ifdef Q_OS_WIN
-    #include <QTest>
-#else
-    #include <QtTest/qtest.h>
-#endif
+#include <QTest>

 #include "core/controllers/coreController.h"
 #include "core/models/serverConfig.h"
@@ -28,14 +23,12 @@ private:

    QString getPath()
    {
-        QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
-        return env.value("TEST_PATH");
+        return QProcessEnvironment::systemEnvironment().value("TEST_SITES_LIST_PATH");
    }

    QString getExportPath()
    {
-        QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
-        return env.value("TEST_EXPORT_PATH");
+        return QProcessEnvironment::systemEnvironment().value("TEST_EXPORT_PATH");
    }

    QString normalizeHostname(const QString &hostname) const