status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix ui tests

This commit is contained in:
Anton Iakimov 2024-10-17 16:34:58 +02:00
parent ebbaf5ae64
commit a588c4bb5f
No known key found for this signature in database
2 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -371,7 +371,7 @@ statusq-tests:
run-statusq-tests: export QTWEBENGINE_CHROMIUM_FLAGS := "${QTWEBENGINE_CHROMIUM_FLAGS} --disable-seccomp-filter-sandbox" run-statusq-tests: export QTWEBENGINE_CHROMIUM_FLAGS := "${QTWEBENGINE_CHROMIUM_FLAGS} --disable-seccomp-filter-sandbox"
run-statusq-tests: statusq-tests run-statusq-tests: statusq-tests
echo -e "\033[92mRunning:\033[39m StatusQ Unit Tests" echo -e "\033[92mRunning:\033[39m StatusQ Unit Tests"
ctest -V --test-dir $(STATUSQ_BUILD_PATH) ${ARGS} cd $(STATUSQ_BUILD_PATH) && nixGL ctest -V ${ARGS}
## ##
## Storybook ## Storybook
@ -410,12 +410,12 @@ run-storybook: storybook-build
run-storybook-tests: storybook-build run-storybook-tests: storybook-build
echo -e "\033[92mRunning:\033[39m Storybook Tests" echo -e "\033[92mRunning:\033[39m Storybook Tests"
ctest -V --test-dir $(STORYBOOK_BUILD_PATH) -E PagesValidator cd $(STORYBOOK_BUILD_PATH) && nixGL ctest -V -E PagesValidator
# repeat because of https://bugreports.qt.io/browse/QTBUG-92236 (Qt < 5.15.4) # repeat because of https://bugreports.qt.io/browse/QTBUG-92236 (Qt < 5.15.4)
run-storybook-pages-validator: storybook-build run-storybook-pages-validator: storybook-build
echo -e "\033[92mRunning:\033[39m Storybook Pages Validator" echo -e "\033[92mRunning:\033[39m Storybook Pages Validator"
ctest -V --test-dir $(STORYBOOK_BUILD_PATH) -R PagesValidator --repeat until-pass:3 cd $(STORYBOOK_BUILD_PATH) && nixGL ctest -V -R PagesValidator --repeat until-pass:3
storybook-clean: storybook-clean:
echo -e "\033[92mCleaning:\033[39m Storybook" echo -e "\033[92mCleaning:\033[39m Storybook"

20
ci/Jenkinsfile.tests-ui
View File

@ -5,9 +5,7 @@ library 'status-jenkins-lib@v1.9.7'
def isPRBuild = utils.isPRBuild() def isPRBuild = utils.isPRBuild()
pipeline { pipeline {
agent { agent { label 'linux && x86_64 && nix-2.19' }
label 'linux && x86_64 && qt-5.15.2'
}
parameters { parameters {
choice( choice(
@ -37,27 +35,25 @@ pipeline {
PLATFORM = 'tests/ui' PLATFORM = 'tests/ui'
/* Improve make performance */ /* Improve make performance */
MAKEFLAGS = "-j4 V=${params.VERBOSE}" MAKEFLAGS = "-j4 V=${params.VERBOSE}"
/* Makefile assumes the compiler folder is included */
QTDIR = "/opt/qt/5.15.2/gcc_64"
PATH = "${env.QTDIR}/bin:${env.PATH}" PATH = "${env.QTDIR}/bin:${env.PATH}"
} }
stages { stages {
stage('Build StatusQ Tests') { stage('Build StatusQ Tests') {
steps { steps {
sh 'make statusq-tests' nix.shell('make statusq-tests', pure: true)
} }
} }
stage('Build StatusQ Sanity Checker') { stage('Build StatusQ Sanity Checker') {
steps { steps {
sh 'make statusq-sanity-checker' nix.shell('make statusq-sanity-checker', pure: true)
} }
} }
stage('Build Storybook') { stage('Build Storybook') {
steps { steps {
sh 'make storybook-build' nix.shell('make storybook-build', pure: true)
} }
} }
@ -70,7 +66,7 @@ pipeline {
parallelBuild: true, parallelBuild: true,
screen: '2560x1440x24', screen: '2560x1440x24',
]) { ]) {
sh('make run-statusq-tests') nix.shell('make run-statusq-tests', pure: true)
} }
} } } }
} }
@ -84,7 +80,7 @@ pipeline {
parallelBuild: true, parallelBuild: true,
screen: '2560x1440x24', screen: '2560x1440x24',
]) { ]) {
sh('make run-statusq-sanity-checker') nix.shell('make run-statusq-sanity-checker', pure: true)
} }
} } } }
} }
@ -98,7 +94,7 @@ pipeline {
parallelBuild: true, parallelBuild: true,
screen: '2560x1440x24', screen: '2560x1440x24',
]) { ]) {
sh('make run-storybook-tests') nix.shell('make run-storybook-tests', pure: true)
} }
} } } }
} }
@ -112,7 +108,7 @@ pipeline {
parallelBuild: true, parallelBuild: true,
screen: '2560x1440x24', screen: '2560x1440x24',
]) { ]) {
sh('make run-storybook-pages-validator') nix.shell('make run-storybook-pages-validator', pure: true)
} }
} } } }
} }