[KVM-AUTOTEST] KVM test: kvm_tests.cfg.sample: improve shell_prompt regular expressions

Commit Message

Michael Goldish Aug. 11, 2009, 12:31 p.m. UTC

Require that shell prompts start at the beginning of the line (^) and be
followed by nothing more than whitespace (\s*$).
Also remove the length limitation from Windows prompts, and do not restrict
them to C:\.
Also do not require RHEL and Fedora prompts to contain 'root@'.

Signed-off-by: Michael Goldish <[e-mail]>
---
 client/tests/kvm/kvm_tests.cfg.sample |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

Patch

diff --git a/client/tests/kvm/kvm_tests.cfg.sample b/client/tests/kvm/kvm_tests.cfg.sample
index 05a1ca7..7a896fe 100644
--- a/client/tests/kvm/kvm_tests.cfg.sample
+++ b/client/tests/kvm/kvm_tests.cfg.sample
@@ -171,7 +171,7 @@  variants:
         variants:
             - Fedora:
                 no setup
-                shell_prompt = "\[root@.{0,50}][\#\$] "
+                shell_prompt = "^\[.*\][\#\$]\s*$"
 
                 variants:
                     - 8.32:
@@ -253,7 +253,7 @@  variants:
                     md5sum_1m = 768ca32503ef92c28f2d144f2a87e4d0
 
             - @Ubuntu:
-                shell_prompt = "root@.{0,50}[\#\$] "
+                shell_prompt = "^root@.*[\#\$]\s*$"
 
                 variants:
                     - Ubuntu-6.10-32:
@@ -285,7 +285,7 @@  variants:
 
             - RHEL:
                 no setup
-                shell_prompt = "\[root@.{0,50}][\#\$] "
+                shell_prompt = "^\[.*\][\#\$]\s*$"
 
                 variants:
                     - 5.3.i386:
@@ -348,7 +348,7 @@  variants:
         shutdown_command = shutdown /s /t 0
         reboot_command = shutdown /r /t 0
         status_test_command = echo %errorlevel%
-        shell_prompt = "C:\\.{0,50}>"
+        shell_prompt = "^\w:\\.*>\s*$"
         shell_client = nc
         shell_port = 22
         # File transfers are currently unsupported