Skip to content

Commit 9d21e69

Browse files
committed
[ci] Revise github actions to collect additional code coverage of the backend during browsertesting
1 parent 3ccddd8 commit 9d21e69

File tree

2 files changed

+30
-35
lines changed

2 files changed

+30
-35
lines changed

.github/workflows/scripts/run_tests_backend.sh

+10-16
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,19 @@
22

33
backend_test_failed=0
44

5-
setupBackend() {
6-
cd $GITHUB_WORKSPACE/backend # to install backend dependencies
7-
pip3 install -r requirements/requirements-$(lsb_release -cs).txt
8-
}
9-
10-
setupClient() {
11-
cd $GITHUB_WORKSPACE/client # to install frontend dependencies
12-
npm install -d
13-
./node_modules/grunt/bin/grunt build
14-
}
15-
165
echo "Running setup"
176
sudo apt-get update
187
sudo apt-get install -y tor
19-
npm install -g grunt grunt-cli
8+
9+
cd $GITHUB_WORKSPACE/backend # to install backend dependencies
10+
python3 -mvenv env
11+
source env/bin/activate
2012
pip3 install coverage
13+
pip3 install -r requirements/requirements-$(lsb_release -cs).txt
2114

22-
setupBackend
23-
setupClient
15+
cd $GITHUB_WORKSPACE/client # to install frontend dependencies
16+
npm install -d
17+
./node_modules/grunt/bin/grunt build
2418

2519
# Running backend tests
2620
echo "Running backend tests"
@@ -29,8 +23,8 @@ if [ $? -ne 0 ]; then
2923
backend_test_failed=1
3024
fi
3125

32-
cd $GITHUB_WORKSPACE/backend && coverage xml
33-
bash <(curl -Ls https://coverage.codacy.com/get.sh) report -l Python -r $GITHUB_WORKSPACE/backend/coverage.xml
26+
cd $GITHUB_WORKSPACE/backend && coverage lcov -o lcov.info
27+
bash <(curl -Ls https://coverage.codacy.com/get.sh) report -l Python -r $GITHUB_WORKSPACE/backend/lcov.info --partial
3428

3529
if [ $backend_test_failed -eq 1 ]; then
3630
echo "Backend unit tests: FAILED"

.github/workflows/scripts/run_tests_client.sh

+20-19
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,23 @@
22

33
client_test_failed=0
44

5-
setupBackend() {
6-
cd $GITHUB_WORKSPACE/backend # to install backend dependencies
7-
pip3 install -r requirements/requirements-$(lsb_release -cs).txt
8-
}
9-
10-
setupClient() {
11-
cd $GITHUB_WORKSPACE/client # to install frontend dependencies
12-
npm install -d
13-
./node_modules/grunt/bin/grunt build_for_testing
14-
}
15-
165
echo "Running setup"
176
sudo apt-get update
187
sudo apt-get install -y tor
19-
npm install -g grunt grunt-cli
8+
9+
cd $GITHUB_WORKSPACE/backend # to install backend dependencies
10+
python3 -mvenv env
11+
source env/bin/activate
2012
pip3 install coverage
13+
pip3 install -r requirements/requirements-$(lsb_release -cs).txt
2114

22-
setupBackend
23-
setupClient
15+
cd $GITHUB_WORKSPACE/client # to install frontend dependencies
16+
npm install -d
17+
./node_modules/grunt/bin/grunt build_for_testing
2418

25-
cd $GITHUB_WORKSPACE/backend/ && coverage run ./bin/globaleaks -z -n &
19+
cd $GITHUB_WORKSPACE/backend && coverage run ./bin/globaleaks -z -n &
20+
21+
PID=$!
2622

2723
sleep 5
2824

@@ -33,13 +29,18 @@ if [ $? -ne 0 ]; then
3329
client_test_failed=1
3430
fi
3531

36-
killall coverage -9
32+
sleep 3
33+
34+
sudo killall coverage
35+
36+
sleep 3
3737

38-
sed -i 's|SF:dist/|SF:client/|g' $GITHUB_WORKSPACE/client/cypress/coverage/lcov.info
38+
sed -i 's|SF:dist/|SF:client/|g' $GITHUB_WORKSPACE/client/cypress/coverage/lcov.info --partial
3939
bash <(curl -Ls https://coverage.codacy.com/get.sh) report -l TypeScript -r $GITHUB_WORKSPACE/client/cypress/coverage/lcov.info
4040

41-
cd $GITHUB_WORKSPACE/backend && coverage xml
42-
bash <(curl -Ls https://coverage.codacy.com/get.sh) report -l Python -r $GITHUB_WORKSPACE/backend/coverage.xml
41+
cd $GITHUB_WORKSPACE/backend && coverage lcov -o $GITHUB_WORKSPACE/backend/lcov.info
42+
sed -i 's|SF:globaleaks/|SF:backend/globaleaks/|g' $GITHUB_WORKSPACE/backend/lcov.info
43+
bash <(curl -Ls https://coverage.codacy.com/get.sh) report -l Python -r $GITHUB_WORKSPACE/backend/lcov.info --partial
4344

4445
if [ $client_test_failed -eq 1 ]; then
4546
echo "Client tests: FAILED"

0 commit comments

Comments
 (0)