Skip to content

Commit e9ad805

Browse files
Skip test_graphical_camera_settings.py on macOS because no camera support
1 parent 5c3e900 commit e9ad805

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

tests/test_graphical_camera_settings.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import mpos.apps
2323
import mpos.ui
2424
import os
25+
import sys
2526
from mpos.ui.testing import (
2627
wait_for_render,
2728
capture_screenshot,
@@ -33,7 +34,7 @@
3334
get_widget_coords
3435
)
3536

36-
37+
@unittest.skipIf(sys.platform == 'darwin', "Camera tests not supported on macOS (no camera available)")
3738
class TestGraphicalCameraSettings(unittest.TestCase):
3839
"""Test suite for Camera app settings verification."""
3940

tests/unittest.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ $(cat $file)
6969
result = unittest.main() ; sys.exit(0 if result.wasSuccessful() else 1) "
7070
result=$?
7171
else
72-
# Regular test: no boot files
72+
echo "Regular test: no boot files"
7373
"$binary" -X heapsize=8M -c "import sys ; sys.path.insert(0, 'lib') ; import mpos ; mpos.TaskManager.disable() ; $(cat main.py)
7474
$(cat $file)
7575
result = unittest.main() ; sys.exit(0 if result.wasSuccessful() else 1) "
@@ -143,7 +143,11 @@ if [ -z "$onetest" ]; then
143143
else
144144
echo "doing $onetest"
145145
one_test $(readlink -f "$onetest")
146-
[ $? -ne 0 ] && failed=1
146+
result=$?
147+
if [ $result -ne 0 ]; then
148+
echo "Test returned result: $result"
149+
failed=1
150+
fi
147151
fi
148152

149153

0 commit comments

Comments
 (0)