[nongnu] elpa/bash-completion e24a596631 283/313: Make integration tests stabler.

[ELPA Syncer]

branch: elpa/bash-completion
commit e24a596631635f0307c4c52522a693896e41e3f2
Author: Stephane Zermatten <szermatt@gmx.net>
Commit: Stephane Zermatten <szermatt@gmx.net>

    Make integration tests stabler.
    
    This change helps integration tests ignore any system-wide message that
    appear when a shell is started, it:
     - waits for specific prompts instead of relying on the prompt regexp
     - adds a mark at the end of the bashrc to define the start of the
     interesting section, for functions that check buffer content
---
 test/bash-completion-integration-test.el | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/test/bash-completion-integration-test.el 
b/test/bash-completion-integration-test.el
index 827cfbad87..1e227d8082 100644
--- a/test/bash-completion-integration-test.el
+++ b/test/bash-completion-integration-test.el
@@ -34,9 +34,11 @@
 (require 'ert)
 
 (defvar bash-completion_test-setup-completion "/etc/bash_completion")
+(defconst bash-completion_test-start-mark "====START====")
 
 (defmacro bash-completion_test-harness (bashrc use-separate-process &rest body)
-  `(let ((test-env-dir (bash-completion_test-setup-env ,bashrc)))
+  `(let ((test-env-dir (bash-completion_test-setup-env
+                        (concat ,bashrc "\necho " 
bash-completion_test-start-mark "\n"))))
      (let ((bash-completion-processes nil)
            (bash-completion-nospace nil)
            (bash-completion-start-files nil)
@@ -127,12 +129,17 @@
 
 (defun bash-completion_test-wait-for-prompt (&optional limit)
   (bash-completion--wait-for-regexp
-   (get-buffer-process shell-buffer) comint-prompt-regexp 3.0 limit))
+   (get-buffer-process shell-buffer) "^.*$ " 3.0 limit))
 
 (defun bash-completion_test-buffer-string (&optional start end)
   (delete-trailing-whitespace (point-min) (point-max))
   (untabify (point-min) (point-max))
-  (buffer-substring-no-properties (or start (point-min)) (or end (point-max))))
+  (buffer-substring-no-properties
+   (or start
+       (save-excursion
+         (goto-char (point-min))
+         (1+ (search-forward bash-completion_test-start-mark end))))
+   (or end (point-max))))
 
 (defun bash-completion_test-candidates (complete-me)
   "Complete COMPLETE-ME and returns the candidates."