Fix spelling of occurred (#1170)

Author: jboddey

cmd/build

@@ -45,7 +45,7 @@ fi
 if docker build -t testrun/ui -f modules/ui/ui.Dockerfile . ; then
   echo Successully built the user interface
 else
-  echo An error occured whilst building the user interface
+  echo An error occurred whilst building the user interface
   exit 1
 fi
 
@@ -54,7 +54,7 @@ echo Building websockets server
 if docker build -t testrun/ws -f modules/ws/ws.Dockerfile . ; then
   echo Successully built the web sockets server
 else
-  echo An error occured whilst building the websockets server
+  echo An error occurred whilst building the websockets server
   exit 1
 fi
 
@@ -66,7 +66,7 @@ for dir in modules/network/* ; do
   if docker build -f modules/network/$module/$module.Dockerfile -t testrun/$module . ; then
     echo Successfully built container for network $module
   else
-    echo An error occured whilst building container for network module $module
+    echo An error occurred whilst building container for network module $module
     exit 1
   fi
 done
@@ -79,7 +79,7 @@ for dir in modules/devices/* ; do
   if docker build -f modules/devices/$module/$module.Dockerfile -t testrun/$module . ; then
     echo Successfully built container for device module $module
   else
-    echo An error occured whilst building container for device module $module
+    echo An error occurred whilst building container for device module $module
     exit 1
   fi
 done
@@ -92,7 +92,7 @@ for dir in modules/test/* ; do
   if docker build -f modules/test/$module/$module.Dockerfile -t testrun/$module-test . ; then
     echo Successfully built container for test module $module
   else
-    echo An error occured whilst building container for test module $module
+    echo An error occurred whilst building container for test module $module
     exit 1
   fi
 done

cmd/build_ui

@@ -21,7 +21,7 @@ echo Building the ui builder
 if docker build -t testrun/build-ui -f modules/ui/build.Dockerfile . ; then
   echo Successully built the ui builder
 else
-  echo An error occured whilst building the ui builder
+  echo An error occurred whilst building the ui builder
   exit 1
 fi
 

docs/dev/mockoon.json

@@ -885,10 +885,10 @@
         },
         {
           "uuid": "220e4ba9-6463-4dc3-b714-f77643706b7d",
-          "body": "{\n  \"error\": \"An error occured whilst deleting the report\"\n}",
+          "body": "{\n  \"error\": \"An error occurred whilst deleting the report\"\n}",
           "latency": 0,
           "statusCode": 500,
-          "label": "Error occured",
+          "label": "Error occurred",
           "headers": [],
           "bodyType": "INLINE",
           "filePath": "",
@@ -971,10 +971,10 @@
         },
         {
           "uuid": "a7fbb2c8-81dc-4a40-80d6-482119314086",
-          "body": "{\n  \"error\": \"An error occured whilst getting the report\"\n}",
+          "body": "{\n  \"error\": \"An error occurred whilst getting the report\"\n}",
           "latency": 0,
           "statusCode": 500,
-          "label": "Error occured",
+          "label": "Error occurred",
           "headers": [],
           "bodyType": "INLINE",
           "filePath": "",
@@ -1151,10 +1151,10 @@
         },
         {
           "uuid": "3bcb2d6d-3290-43bb-8392-7bfffda4feae",
-          "body": "{\n  \"error\": \"An error occured whilst getting the test attempt\"\n}",
+          "body": "{\n  \"error\": \"An error occurred whilst getting the test attempt\"\n}",
           "latency": 0,
           "statusCode": 500,
-          "label": "Error occured",
+          "label": "Error occurred",
           "headers": [],
           "bodyType": "INLINE",
           "filePath": "",
@@ -1691,7 +1691,7 @@
           "body": "{\n    \"error\": \"Error retrieving the profile PDF\"\n}",
           "latency": 0,
           "statusCode": 500,
-          "label": "Error occured",
+          "label": "Error occurred",
           "headers": [],
           "bodyType": "INLINE",
           "filePath": "",

docs/dev/postman.json

@@ -495,7 +495,7 @@ async def delete_report(self, request: Request, response: Response):
       return self._generate_msg(True, "Deleted report")
 
     response.status_code = 500
-    return self._generate_msg(False, "Error occured whilst deleting report")
+    return self._generate_msg(False, "Error occurred whilst deleting report")
 
   async def delete_device(self, request: Request, response: Response):
 
@@ -546,7 +546,7 @@ async def delete_device(self, request: Request, response: Response):
       LOGGER.error(e)
       response.status_code = 500
       return self._generate_msg(
-          False, "An error occured whilst deleting the device")
+          False, "An error occurred whilst deleting the device")
 
   async def save_device(self, request: Request, response: Response):
     LOGGER.debug("Received device post request")

framework/python/src/api/api.py

@@ -279,7 +279,7 @@ def _load_test_reports(self, device):
 
       # Check if the report.json file exists
       if not os.path.isfile(report_json_file_path):
-        # Some error may have occured during this test run
+        # Some error may have occurred during this test run
         continue
 
       with open(report_json_file_path, encoding='utf-8') as report_json_file:
@@ -514,7 +514,7 @@ def start_ui(self):
                             detach=True,
                             ports={'80': 8080})
     except docker.errors.ImageNotFound as ie:
-      LOGGER.error('An error occured whilst starting the UI. ' +
+      LOGGER.error('An error occurred whilst starting the UI. ' +
                    'Please investigate and try again.')
       LOGGER.error(ie)
       sys.exit(1)
@@ -555,7 +555,7 @@ def start_ws(self):
                                 '1883': 1883
                             })
     except docker.errors.ImageNotFound as ie:
-      LOGGER.error('An error occured whilst starting the websockets server. ' +
+      LOGGER.error('An error occurred whilst starting the websockets server. ' +
                    'Please investigate and try again.')
       LOGGER.error(ie)
       sys.exit(1)

framework/python/src/core/testrun.py

@@ -165,7 +165,7 @@ def run_tests(self):
             if len(result) > 1:
               test['description'] = result[1]
             else:
-              test['description'] = 'An error occured whilst running this test'
+              test['description'] = 'An error occurred whilst running this test'
 
           # Compliant / Non-Compliant result
           elif isinstance(result[0], bool):
@@ -194,7 +194,7 @@ def run_tests(self):
       else:
         LOGGER.debug('No result was returned from the test module')
         test['result'] = TestResult.ERROR
-        test['description'] = 'An error occured whilst running this test'
+        test['description'] = 'An error occurred whilst running this test'
 
       # Remove the steps to resolve if compliant already
       if (test['result'] == TestResult.COMPLIANT and 'recommendations' in test):

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

@@ -93,7 +93,7 @@ def validate_device(self):
         description = 'BACnet device could not be discovered'
       LOGGER.info(description)
     except Exception: # pylint: disable=W0718
-      LOGGER.error('Error occured when validating device', exc_info=True)
+      LOGGER.error('Error occurred when validating device', exc_info=True)
     return result, description
 
 
@@ -141,7 +141,7 @@ def validate_bacnet_source(self, object_id, device_hw_addr):
             valid = False
       return valid
     except Exception: # pylint: disable=W0718
-      LOGGER.error('Error occured when validating source', exc_info=True)
+      LOGGER.error('Error occurred when validating source', exc_info=True)
       return False
 
   def get_bacnet_packets(self, capture_file, object_id):

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

@@ -83,7 +83,7 @@
       },
       {
         "name": "security.tls.v1_2_client",
-        "description": "An error occured whilst running this test",
+        "description": "An error occurred whilst running this test",
         "expected_behavior": "The packet indicates a TLS connection with at least TLS 1.2 and support for ECDH and ECDSA ciphers",
         "required_result": "Required if Applicable",
         "result": "Error"
@@ -102,7 +102,7 @@
       },
       {
         "name": "security.tls.v1_3_client",
-        "description": "An error occured whilst running this test",
+        "description": "An error occurred whilst running this test",
         "expected_behavior": "The packet indicates a TLS connection with at least TLS 1.3",
         "required_result": "Informational",
         "result": "Error"