PR #8788 from Matan: find_first_device_or_exit (cpp/py) exit with err…

…or with no device
IntelRealSense · Apr 28, 2021 · 8cfef06 · 8cfef06
2 parents bddae60 + 808a9a7
commit 8cfef06
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/unit-tests/func/func-common.h b/unit-tests/func/func-common.h
@@ -15,8 +15,8 @@ inline rs2::device find_first_device_or_exit()
     rs2::device_list devices_list = ctx.query_devices();
     if( devices_list.size() == 0 )
     {
-        std::cout << "No device was found; skipping test" << std::endl;
-        exit( 0 );
+        std::cout << "No device was found" << std::endl;
+        exit( 1 );
     }
     return devices_list[0];
 }
@@ -27,9 +27,9 @@ inline rs2::device_list find_devices_by_product_line_or_exit( int product )
     rs2::device_list devices_list = ctx.query_devices( product );
     if( devices_list.size() == 0 )
     {
-        std::cout << "No device of the " << product << " product line was found; skipping test"
+        std::cout << "No device of the " << product << " product line was found"
                   << std::endl;
-        exit( 0 );
+        exit( 1 );
     }
 
     return devices_list;
@@ -68,8 +68,8 @@ inline rs2::device find_first_device_by_name_or_exit( const std::string & dev_na
         return *dev_iter;
     }
 
-    std::cout << "No " << dev_name << " device was found; skipping test" << std::endl;
-    exit( 0 );
+    std::cout << "No " << dev_name << " device was found" << std::endl;
+    exit( 1 );
 }
 
 // Return the first device that supports the input option or exits.

diff --git a/unit-tests/py/rspy/test.py b/unit-tests/py/rspy/test.py
@@ -71,8 +71,7 @@ def find_first_device_or_exit():
     import pyrealsense2 as rs
     c = rs.context()
     if not c.devices.size():  # if no device is connected we skip the test
-        print("No device found, skipping test")
-        sys.exit( 0 )
+        log.f("No device found")
     dev = c.devices[0]
     log.d( 'found', dev )
     return dev
@@ -89,8 +88,7 @@ def find_devices_by_product_line_or_exit( product_line ):
     c = rs.context()
     devices_list = c.query_devices(product_line)
     if devices_list.size() == 0:
-        print( "No device of the", product_line, "product line was found; skipping test" )
-        sys.exit( 0 )
+        log.f( "No device of the", product_line, "product line was found" )
     log.d( 'found', devices_list.size(), product_line, 'devices:', [dev for dev in devices_list] )
     return devices_list