colin/iio-sensor-proxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests: Skip some test when fr_FR locale isn't available

Browse Source 
Some test require that locale so skip those when it is unavailable.

Closes: #392
This commit is contained in:
Guido Günther
2024-03-04 08:18:54 +01:00
committed by Dylan Van Assche
parent 9833a28080
commit fe56bdba12
2 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/test-mount-matrix.c
View File

@@ -66,12 +66,16 @@ test_mount_matrix (void)
static void static void
test_comma_decimal_separator (void) test_comma_decimal_separator (void)
{ {
const char *fr_locale = "fr_FR.UTF-8";
char *old_locale; char *old_locale;
AccelVec3 *vecs; AccelVec3 *vecs;
old_locale = setlocale (LC_ALL, "fr_FR.UTF-8"); old_locale = setlocale (LC_ALL, fr_locale);
/* French locale not available? */ /* French locale not available? */
g_assert_nonnull (old_locale); if (!old_locale) {
g_test_skip_printf ("Local %s not available", fr_locale);
return;
}
/* Default matrix */ /* Default matrix */
g_assert_true (parse_mount_matrix (DEFAULT_MATRIX, &vecs)); g_assert_true (parse_mount_matrix (DEFAULT_MATRIX, &vecs));

20
tests/integration-test.py
View File

@@ -27,6 +27,7 @@ import tempfile
import psutil import psutil
import subprocess import subprocess
import unittest import unittest
import locale
import time import time
try: try:
@@ -50,6 +51,7 @@ SP_COMPASS = 'net.hadess.SensorProxy.Compass'
SP_COMPASS_PATH = '/net/hadess/SensorProxy/Compass' SP_COMPASS_PATH = '/net/hadess/SensorProxy/Compass'
class Tests(dbusmock.DBusTestCase): class Tests(dbusmock.DBusTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
# run from local build tree if we are in one, otherwise use system instance # run from local build tree if we are in one, otherwise use system instance
@@ -92,6 +94,15 @@ class Tests(dbusmock.DBusTestCase):
cls.dbus = Gio.bus_get_sync(Gio.BusType.SYSTEM, None) cls.dbus = Gio.bus_get_sync(Gio.BusType.SYSTEM, None)
cls.dbus_con = cls.get_dbus(True) cls.dbus_con = cls.get_dbus(True)
# Some test outputs require the daemon to run under the fr locale:
# so check if that's available
try:
old_loc = locale.setlocale(locale.LC_ALL, 'fr_FR.UTF-8')
cls.has_fr = True
locale.setlocale(locale.LC_ALL, old_loc)
except:
cls.has_fr = False
@classmethod @classmethod
def tearDownClass(cls): def tearDownClass(cls):
cls.test_bus.down() cls.test_bus.down()
@@ -612,10 +623,9 @@ class Tests(dbusmock.DBusTestCase):
mock_file.write(data) mock_file.write(data)
self.proxy.ClaimAccelerometer() self.proxy.ClaimAccelerometer()
self.assertEventually(lambda: self.have_text_in_log('Accel sent by driver')) self.assertEventually(lambda: self.have_text_in_log('Accel sent by driver'))
# If the 2nd test fails, it's likely that fr_FR.UTF-8 locale isn't supported
self.assertEqual(self.have_text_in_log('scale: 0,000000,0,000000,0,000000'), False) self.assertEqual(self.have_text_in_log('scale: 0,000000,0,000000,0,000000'), False)
self.assertEqual(self.have_text_in_log('scale: 0,000010,0,000010,0,000010'), True) if self.has_fr:
self.assertEqual(self.have_text_in_log('scale: 0,000010,0,000010,0,000010'), True)
self.stop_daemon() self.stop_daemon()
def test_iio_scale_decimal_separator_offset(self): def test_iio_scale_decimal_separator_offset(self):
@@ -715,9 +725,9 @@ class Tests(dbusmock.DBusTestCase):
self.proxy.ClaimAccelerometer() self.proxy.ClaimAccelerometer()
self.assertEventually(lambda: self.have_text_in_log('Accel read from IIO on')) self.assertEventually(lambda: self.have_text_in_log('Accel read from IIO on'))
# If the 2nd test fails, it's likely that fr_FR.UTF-8 locale isn't supported
self.assertEqual(self.have_text_in_log('scale 1,000000,1,000000,1,000000'), False) self.assertEqual(self.have_text_in_log('scale 1,000000,1,000000,1,000000'), False)
self.assertEqual(self.have_text_in_log('scale 0,000001,0,000001,0,000001'), True) if self.has_fr:
self.assertEqual(self.have_text_in_log('scale 0,000001,0,000001,0,000001'), True)
self.assertEventually(lambda: self.get_dbus_property('AccelerometerOrientation') == 'normal') self.assertEventually(lambda: self.get_dbus_property('AccelerometerOrientation') == 'normal')