Merge pull request #4392 from wazuh/4391-fix-test-cluster-connection

Fix misspelling regex and error in test_cluster_connection

deps/wazuh_testing/wazuh_testing/cluster.py

@@ -26,7 +26,7 @@ def callback_detect_master_serving(line):
 
 
 def callback_detect_worker_connected(line):
- match = re.match(r'.*Sucessfully connected to master', line)
+ match = re.match(r'.*Successfully connected to master', line)
  if match:
  return line
 

deps/wazuh_testing/wazuh_testing/qa_ctl/deployment/docker_wrapper.py

@@ -98,7 +98,7 @@ def restart(self):
  try:
  DockerWrapper.LOGGER.debug(f"Restarting {self.name} cointainer")
  self.get_container().restart()
- DockerWrapper.LOGGER.debug(f"The {self.name} cointainer has been restarted sucessfully")
+ DockerWrapper.LOGGER.debug(f"The {self.name} cointainer has been restarted successfully")
  except docker.errors.NotFound:
  pass
 
@@ -111,7 +111,7 @@ def halt(self):
  try:
  DockerWrapper.LOGGER.debug(f"Stopping {self.name} cointainer")
  self.get_container().stop()
- DockerWrapper.LOGGER.debug(f"The {self.name} cointainer has been stopped sucessfully")
+ DockerWrapper.LOGGER.debug(f"The {self.name} cointainer has been stopped successfully")
  except docker.errors.NotFound:
  pass
 
@@ -132,14 +132,14 @@ def destroy(self, remove_image=False):
  try:
  DockerWrapper.LOGGER.debug(f"Removing {self.name} cointainer")
  self.get_container().remove()
- DockerWrapper.LOGGER.debug(f"The {self.name} cointainer has been removed sucessfully")
+ DockerWrapper.LOGGER.debug(f"The {self.name} cointainer has been removed successfully")
  except docker.errors.NotFound:
  pass
 
  if remove_image:
  DockerWrapper.LOGGER.debug(f"Removing {self.image.id} docker image")
  self.docker_client.images.remove(image=self.image.id, force=True)
- DockerWrapper.LOGGER.debug(f"The {self.image.id} image has been removed sucessfully")
+ DockerWrapper.LOGGER.debug(f"The {self.image.id} image has been removed successfully")
 
  def get_instance_info(self):
  """Get the parameters information.

deps/wazuh_testing/wazuh_testing/qa_ctl/deployment/qa_infraestructure.py

@@ -122,13 +122,13 @@ def run(self):
  """Run the instances deployment when the local host is UNIX."""
  QAInfraestructure.LOGGER.info(f"Starting {len(self.instances)} instances deployment")
  self.__threads_runner([ThreadExecutor(instance.run) for instance in self.instances])
- QAInfraestructure.LOGGER.info('The instances deployment has finished sucessfully')
+ QAInfraestructure.LOGGER.info('The instances deployment has finished successfully')
 
  def halt(self):
  """Execute the 'halt' method on every configured instance."""
  QAInfraestructure.LOGGER.info(f"Stopping {len(self.instances)} instances")
  self.__threads_runner([ThreadExecutor(instance.halt) for instance in self.instances])
- QAInfraestructure.LOGGER.info('The instances have been stopped sucessfully')
+ QAInfraestructure.LOGGER.info('The instances have been stopped successfully')
 
  def restart(self):
  """Execute the 'restart' method on every configured instance."""
@@ -139,13 +139,13 @@ def destroy(self):
  """Execute the 'destroy' method on every configured instance."""
  QAInfraestructure.LOGGER.info(f"Destroying {len(self.instances)} instances")
  self.__threads_runner([ThreadExecutor(instance.destroy) for instance in self.instances])
- QAInfraestructure.LOGGER.info(f"The instances have been destroyed sucessfully")
+ QAInfraestructure.LOGGER.info(f"The instances have been destroyed successfully")
 
  if self.docker_network:
  QAInfraestructure.LOGGER.info('Removing docker network')
  try:
  self.docker_network.remove()
- QAInfraestructure.LOGGER.info('Docker network has been removed sucessfully')
+ QAInfraestructure.LOGGER.info('Docker network has been removed successfully')
  except docker.errors.NotFound:
  QAInfraestructure.LOGGER.error('Could not remove docker network')
  pass
@@ -160,7 +160,7 @@ def status(self):
  QAInfraestructure.LOGGER.debug('Getting instances status')
  for instance in self.instances:
  status[instance.get_name()] = instance.status()
- QAInfraestructure.LOGGER.debug('Instances status info was obtained sucessfully')
+ QAInfraestructure.LOGGER.debug('Instances status info was obtained successfully')
 
  return status
 
@@ -174,6 +174,6 @@ def get_instances_info(self):
  QAInfraestructure.LOGGER.debug('Getting instances info')
  for instance in self.instances:
  info[instance.get_name()] = instance.get_instance_info()
- QAInfraestructure.LOGGER.debug('Instances info was obtained sucessfully')
+ QAInfraestructure.LOGGER.debug('Instances info was obtained successfully')
 
  return info

deps/wazuh_testing/wazuh_testing/qa_ctl/deployment/vagrant_wrapper.py

@@ -60,25 +60,25 @@ def run(self):
  VagrantWrapper.LOGGER.info(f"{self.vm_box} vagrant box not found in local repository. Downloading and "
  'running')
  self.vagrant.up()
- VagrantWrapper.LOGGER.debug(f"Instance {self.vm_name} has been created sucessfully")
+ VagrantWrapper.LOGGER.debug(f"Instance {self.vm_name} has been created successfully")
 
  def halt(self):
  """Stop the VM specified in the vagrantfile."""
  VagrantWrapper.LOGGER.debug(f"Running {self.vm_name} vagrant halt")
  self.vagrant.halt()
- VagrantWrapper.LOGGER.debug(f"Instance {self.vm_name} has been off sucessfully")
+ VagrantWrapper.LOGGER.debug(f"Instance {self.vm_name} has been off successfully")
 
  def restart(self):
  """Restart the VM specified in the vagrantfile."""
  VagrantWrapper.LOGGER.debug(f"Running {self.vm_name} vagrant restart")
  self.vagrant.restart()
- VagrantWrapper.LOGGER.debug(f"Instance {self.vm_name} has been restarted sucessfully")
+ VagrantWrapper.LOGGER.debug(f"Instance {self.vm_name} has been restarted successfully")
 
  def destroy(self):
  """Destroy the VM specified in the vagrantfile and remove the vagrantfile."""
  VagrantWrapper.LOGGER.debug(f"Running {self.vm_name} vagrant destroy")
  self.vagrant.destroy()
- VagrantWrapper.LOGGER.debug(f"{self.vm_name} instance has been destroyed sucessfully")
+ VagrantWrapper.LOGGER.debug(f"{self.vm_name} instance has been destroyed successfully")
  self.vagrantfile.remove_vagrantfile()
  rmtree(self.box_folder)
 

deps/wazuh_testing/wazuh_testing/qa_ctl/provisioning/qa_provisioning.py

@@ -230,7 +230,7 @@ def run(self):
  for runner_thread in provision_threads:
  runner_thread.join()
 
- QAProvisioning.LOGGER.info('The instances have been provisioned sucessfully')
+ QAProvisioning.LOGGER.info('The instances have been provisioned successfully')
 
  def destroy(self):
  """Destroy all the temporary files created by an instance of this object"""

deps/wazuh_testing/wazuh_testing/scripts/qa_ctl.py

@@ -437,7 +437,7 @@ def main():
  config_generator.run()
  launched['config_generator'] = True
  configuration_file = config_generator.config_file_path
- qactl_logger.debug(f"Configuration file has been created sucessfully in {configuration_file}")
+ qactl_logger.debug(f"Configuration file has been created successfully in {configuration_file}")
 
  # If dry-run mode, then exit after generating the configuration file
  if arguments.dry_run:

tests/reliability/test_cluster/test_cluster_logs/test_cluster_connection/README.md

@@ -67,12 +67,13 @@ artifacts_path = '/tmp/artifacts/cluster_performance/57'
  with open(log_file) as f:
  s = mmap(f.fileno(), 0, access=ACCESS_READ)
  # Search first successful connection message.
- if not (conn := re.search(rb'^.*Sucessfully connected to master.*$', s, flags=re.MULTILINE)):
- pytest.fail(f'Could not find "Sucessfully connected to master" message in the '
+ if not (conn := re.search(rb'^.*Successfully connected to master.*$', s, flags=re.MULTILINE)):
+ pytest.fail(f'Could not find "Successfully connected to master" message in the '
  f'{node_name.search(log_file)[1]}')
 
  # Search if there are any connection attempts after the message found above.
- if re.search(rb'^.*Could not connect to master. Trying.*$', s[conn.end():], flags=re.MULTILINE):
+ if re.search(rb'^.*Could not connect to master. Trying.*$|^.*Successfully connected to master.*$',
+ s[conn.end():], flags=re.MULTILINE):
  disconnected_nodes.append(node_name.search(log_file)[1])
 
  if disconnected_nodes:

tests/reliability/test_cluster/test_cluster_logs/test_cluster_connection/test_cluster_connection.py

@@ -35,11 +35,11 @@ def test_cluster_connection(artifacts_path):
  # Search first successful connection message.
  conn = re.search(rb'^.*Successfully connected to master.*$', s, flags=re.MULTILINE)
  if not conn:
- pytest.fail(f'Could not find "Sucessfully connected to master" message in the '
+ pytest.fail(f'Could not find "Successfully connected to master" message in the '
  f'{node_name.search(log_file)[1]}')
 
  # Search if there are any connection attempts after the message found above.
- if re.search(rb'^.*Could not connect to master. Trying.*$|^.*Sucessfully connected to master.*$',
+ if re.search(rb'^.*Could not connect to master. Trying.*$|^.*Successfully connected to master.*$',
  s[conn.end():], flags=re.MULTILINE):
  disconnected_nodes.append(node_name.search(log_file)[1])