demus/openhab-core
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-core.git synced 2026-07-29 12:34:22 +02:00
Code Issues 1 Packages Projects Releases Wiki Activity

Fix linuxsysfs itest failing when serial device is connected (#3782)

Browse Source 
This fixes that some linuxsysfs tests always fail on Linux whenever a real serial device is connected.
Due to the changes in #3290 the tests would also scan the actual devices causing tests to fail due to unexpected results.

Signed-off-by: Wouter Born <github@maindrain.net>
This commit is contained in:
Wouter Born
2023-08-27 11:16:04 +02:00
committed by GitHub
parent 5daf4ff076
commit 9cc7b58ac0
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/internal/SysfsUsbSerialScanner.java
+4 -2
View File
@@ -67,10 +67,11 @@ public class SysfsUsbSerialScanner implements UsbSerialScanner {
private static final String SYSFS_TTY_DEVICES_DIRECTORY_DEFAULT = "/sys/class/tty"; private static final String SYSFS_TTY_DEVICES_DIRECTORY_DEFAULT = "/sys/class/tty";
private static final String DEV_DIRECTORY_DEFAULT = "/dev"; private static final String DEV_DIRECTORY_DEFAULT = "/dev";
private static final String DEV_SERIAL_BY_ID_DIRECTORY = DEV_DIRECTORY_DEFAULT + "/serial/by-id"; private static final String SERIAL_BY_ID_DIRECTORY = "/serial/by-id";
private String sysfsTtyDevicesDirectory = SYSFS_TTY_DEVICES_DIRECTORY_DEFAULT; private String sysfsTtyDevicesDirectory = SYSFS_TTY_DEVICES_DIRECTORY_DEFAULT;
private String devDirectory = DEV_DIRECTORY_DEFAULT; private String devDirectory = DEV_DIRECTORY_DEFAULT;
private String devSerialByIdDirectory = DEV_DIRECTORY_DEFAULT + SERIAL_BY_ID_DIRECTORY;
private static final String SYSFS_FILENAME_USB_VENDOR_ID = "idVendor"; private static final String SYSFS_FILENAME_USB_VENDOR_ID = "idVendor";
private static final String SYSFS_FILENAME_USB_PRODUCT_ID = "idProduct"; private static final String SYSFS_FILENAME_USB_PRODUCT_ID = "idProduct";
@@ -151,7 +152,7 @@ public class SysfsUsbSerialScanner implements UsbSerialScanner {
} }
// optionally compute links and their corresponding SerialInfo : // optionally compute links and their corresponding SerialInfo :
Path devSerialDir = Path.of(DEV_SERIAL_BY_ID_DIRECTORY); Path devSerialDir = Path.of(devSerialByIdDirectory);
if (exists(devSerialDir) && isDirectory(devSerialDir) && isReadable(devSerialDir)) { if (exists(devSerialDir) && isDirectory(devSerialDir) && isReadable(devSerialDir)) {
// browse serial/by-id directory : // browse serial/by-id directory :
try (DirectoryStream<Path> directoryStream = newDirectoryStream(devSerialDir)) { try (DirectoryStream<Path> directoryStream = newDirectoryStream(devSerialDir)) {
@@ -284,6 +285,7 @@ public class SysfsUsbSerialScanner implements UsbSerialScanner {
if (configurationIsChanged) { if (configurationIsChanged) {
sysfsTtyDevicesDirectory = newSysfsTtyDevicesDirectory; sysfsTtyDevicesDirectory = newSysfsTtyDevicesDirectory;
devDirectory = newDevDirectory; devDirectory = newDevDirectory;
devSerialByIdDirectory = devDirectory + SERIAL_BY_ID_DIRECTORY;
} }
if (!canPerformScans()) { if (!canPerformScans()) {