Fix modbus test and bump version

cmd/package

@@ -17,7 +17,7 @@
 # Creates a package for Testrun
 
 MAKE_SRC_DIR=make
-TESTRUN_VER="1-2-1-alpha"
+TESTRUN_VER="1-2-2-alpha"
 
 # Delete existing make files
 rm -rf $MAKE_SRC_DIR/usr

framework/python/src/common/testreport.py

@@ -57,7 +57,7 @@ def __init__(self,
     self._report_url = ''
     self._cur_page = 0
     # Placeholder until available in json report
-    self._version = 'v1.2.1-alpha'
+    self._version = 'v1.2.2-alpha'
 
   def add_module_reports(self, module_reports):
     self._module_reports = module_reports

make/DEBIAN/control

@@ -1,5 +1,5 @@
 Package: Testrun
-Version: 1.2.1-alpha
+Version: 1.2.2-alpha
 Architecture: amd64
 Maintainer: Google <boddey@google.com>
 Homepage: https://github.com/google/testrun

modules/test/base/python/src/test_module.py

@@ -127,6 +127,9 @@ def run_tests(self):
           # Result may be a string, e.g error
           elif result[0] == 'Error':
             test['result'] = result[0]
+          else:
+            LOGGER.error(f'Unknown result detected: {result[0]}')
+            test['result'] = 'Error'
 
           # Check that description is a string
           if isinstance(result[1], str):

modules/test/protocol/python/src/protocol_modbus.py

@@ -264,7 +264,8 @@ def validate_device(self):
 
       # Since we can't know what data types the device supports
       # we'll pass if any of the supported data types are succesfully read
-      compliant = holding_reg or input_reg or coils or discrete_inputs
+      compliant = (holding_reg is not None or input_reg is not None
+                   or coils is not None or discrete_inputs is not None)
     else:
       compliant = False
       details = 'Failed to establish Modbus connection to device'