consistency use qa_wait_patterns for different interactive installati…

…on commands executed by ABAQUS easyblock
easybuilders · Aug 28, 2024 · 58599f7 · 58599f7
1 parent 6472d46
commit 58599f7
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/easybuild/easyblocks/a/abaqus.py b/easybuild/easyblocks/a/abaqus.py
@@ -1,4 +1,3 @@
-
 ##
 # Copyright 2009-2024 Ghent University
 #
@@ -243,7 +242,7 @@ def install_step(self):
  (r"Choose the .*installation directory.*\n.*\n\n.*:", os.path.join(self.installdir, 'sim')),
  (r"Enter selection \(default: Install\):", ''),
  ]
- run_shell_cmd('./StartTUI.sh', qa_patterns=qa, qa_timeout=100)
+ run_shell_cmd('./StartTUI.sh', qa_patterns=qa, qa_wait_patterns=no_qa, qa_timeout=100)
 
  # F_CAASIMULIAComputeServicesBuildTime part
  change_dir(cwd)
@@ -254,7 +253,7 @@ def install_step(self):
  raise EasyBuildError("Failed to find expected subdir for hotfix: %s", subdirs)
 
  cwd = change_dir(os.path.join(cwd, subdir, '1'))
- run_shell_cmd('./StartTUI.sh', qa_patterns=qa, qa_timeout=100)
+ run_shell_cmd('./StartTUI.sh', qa_patterns=qa, qa_wait_patterns=no_qa, qa_timeout=100)
  change_dir(cwd)
 
  # next install Part_SIMULIA_Abaqus_CAE hotfix (ABAQUS versions <= 2020)
@@ -277,7 +276,7 @@ def install_step(self):
  (r"\[2\] Continue\n(?:.|\n)*Please choose an action:", '2'),
  ]
  no_qa = [r"Please be patient; it will take a few minutes to complete\.\n(\.)*"]
- run_shell_cmd('./StartTUI.sh', qa_patterns=qa, qa_timeout=100)
+ run_shell_cmd('./StartTUI.sh', qa_patterns=qa, qa_wait_patterns=no_qa, qa_timeout=100)
  change_dir(cwd)
 
  # install SIMULIA Established Products hotfix (ABAQUS versions > 2020)
@@ -306,7 +305,7 @@ def install_step(self):
  (r"Enter selection \(default: Close\):", ''),
  ]
 
- run_shell_cmd('./StartTUI.sh', qa_patterns=qa, qa_timeout=100)
+ run_shell_cmd('./StartTUI.sh', qa_patterns=qa, qa_wait_patterns=no_qa, qa_timeout=100)
  change_dir(cwd)
 
  # create 'abaqus' symlink for main command, which is not there anymore starting with ABAQUS 2022