[Pkg-shadow-commits] r3234 - in debian/trunk/tests/expiry: 01_expiry_-c_no_expiry 02_expiry_-c_expired 03_expiry_-f_expired 04_expiry_no_options 05_expiry_-c_no_shadow_file 06_expiry_-c_no_shadow_entry 07_expiry_-c_expired_account 08_expiry_-c_expired_max+inact 09_expiry_-c_expired_not_inactive

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2010-08-26 19:13:30 +0000 (Thu, 26 Aug 2010)
New Revision: 3234

Modified:
   debian/trunk/tests/expiry/01_expiry_-c_no_expiry/expiry.exp
   debian/trunk/tests/expiry/02_expiry_-c_expired/expiry.exp
   debian/trunk/tests/expiry/03_expiry_-f_expired/expiry.exp
   debian/trunk/tests/expiry/04_expiry_no_options/expiry.exp
   debian/trunk/tests/expiry/05_expiry_-c_no_shadow_file/expiry.exp
   debian/trunk/tests/expiry/06_expiry_-c_no_shadow_entry/expiry.exp
   debian/trunk/tests/expiry/07_expiry_-c_expired_account/expiry.exp
   debian/trunk/tests/expiry/08_expiry_-c_expired_max+inact/expiry.exp
   debian/trunk/tests/expiry/09_expiry_-c_expired_not_inactive/expiry.exp
Log:
Explicitly set PS1 in order to support test environments where the default shell is set to dash.


Modified: debian/trunk/tests/expiry/01_expiry_-c_no_expiry/expiry.exp
===================================================================
--- debian/trunk/tests/expiry/01_expiry_-c_no_expiry/expiry.exp	2010-08-22 19:36:09 UTC (rev 3233)
+++ debian/trunk/tests/expiry/01_expiry_-c_no_expiry/expiry.exp	2010-08-26 19:13:30 UTC (rev 3234)
@@ -4,6 +4,7 @@
 expect_after default {puts "\nFAIL"; exit 1}
 
 spawn /bin/sh
+send "if \[ \$(id -u) -eq 0 \]; then PS1='# '; else PS1='$ '; fi\r"
 expect "# "
 
 send "expiry -c\r"

Modified: debian/trunk/tests/expiry/02_expiry_-c_expired/expiry.exp
===================================================================
--- debian/trunk/tests/expiry/02_expiry_-c_expired/expiry.exp	2010-08-22 19:36:09 UTC (rev 3233)
+++ debian/trunk/tests/expiry/02_expiry_-c_expired/expiry.exp	2010-08-26 19:13:30 UTC (rev 3234)
@@ -4,6 +4,7 @@
 expect_after default {puts "\nFAIL"; exit 1}
 
 spawn /bin/sh
+send "if \[ \$(id -u) -eq 0 \]; then PS1='# '; else PS1='$ '; fi\r"
 expect "# "
 
 send "expiry -c\r"

Modified: debian/trunk/tests/expiry/03_expiry_-f_expired/expiry.exp
===================================================================
--- debian/trunk/tests/expiry/03_expiry_-f_expired/expiry.exp	2010-08-22 19:36:09 UTC (rev 3233)
+++ debian/trunk/tests/expiry/03_expiry_-f_expired/expiry.exp	2010-08-26 19:13:30 UTC (rev 3234)
@@ -4,6 +4,7 @@
 expect_after default {puts "\nFAIL"; exit 1}
 
 spawn /bin/sh
+send "if \[ \$(id -u) -eq 0 \]; then PS1='# '; else PS1='$ '; fi\r"
 expect "# "
 
 send "expiry -f\r"

Modified: debian/trunk/tests/expiry/04_expiry_no_options/expiry.exp
===================================================================
--- debian/trunk/tests/expiry/04_expiry_no_options/expiry.exp	2010-08-22 19:36:09 UTC (rev 3233)
+++ debian/trunk/tests/expiry/04_expiry_no_options/expiry.exp	2010-08-26 19:13:30 UTC (rev 3234)
@@ -4,6 +4,7 @@
 expect_after default {puts "\nFAIL"; exit 1}
 
 spawn /bin/sh
+send "if \[ \$(id -u) -eq 0 \]; then PS1='# '; else PS1='$ '; fi\r"
 expect "# "
 
 send "expiry\r"

Modified: debian/trunk/tests/expiry/05_expiry_-c_no_shadow_file/expiry.exp
===================================================================
--- debian/trunk/tests/expiry/05_expiry_-c_no_shadow_file/expiry.exp	2010-08-22 19:36:09 UTC (rev 3233)
+++ debian/trunk/tests/expiry/05_expiry_-c_no_shadow_file/expiry.exp	2010-08-26 19:13:30 UTC (rev 3234)
@@ -4,6 +4,7 @@
 expect_after default {puts "\nFAIL"; exit 1}
 
 spawn /bin/sh
+send "if \[ \$(id -u) -eq 0 \]; then PS1='# '; else PS1='$ '; fi\r"
 expect "# "
 
 send "expiry -c\r"

Modified: debian/trunk/tests/expiry/06_expiry_-c_no_shadow_entry/expiry.exp
===================================================================
--- debian/trunk/tests/expiry/06_expiry_-c_no_shadow_entry/expiry.exp	2010-08-22 19:36:09 UTC (rev 3233)
+++ debian/trunk/tests/expiry/06_expiry_-c_no_shadow_entry/expiry.exp	2010-08-26 19:13:30 UTC (rev 3234)
@@ -4,6 +4,7 @@
 expect_after default {puts "\nFAIL"; exit 1}
 
 spawn /bin/sh
+send "if \[ \$(id -u) -eq 0 \]; then PS1='# '; else PS1='$ '; fi\r"
 expect "# "
 
 send "expiry -c\r"

Modified: debian/trunk/tests/expiry/07_expiry_-c_expired_account/expiry.exp
===================================================================
--- debian/trunk/tests/expiry/07_expiry_-c_expired_account/expiry.exp	2010-08-22 19:36:09 UTC (rev 3233)
+++ debian/trunk/tests/expiry/07_expiry_-c_expired_account/expiry.exp	2010-08-26 19:13:30 UTC (rev 3234)
@@ -4,6 +4,7 @@
 expect_after default {puts "\nFAIL"; exit 1}
 
 spawn /bin/sh
+send "if \[ \$(id -u) -eq 0 \]; then PS1='# '; else PS1='$ '; fi\r"
 expect "# "
 
 send "expiry -c\r"

Modified: debian/trunk/tests/expiry/08_expiry_-c_expired_max+inact/expiry.exp
===================================================================
--- debian/trunk/tests/expiry/08_expiry_-c_expired_max+inact/expiry.exp	2010-08-22 19:36:09 UTC (rev 3233)
+++ debian/trunk/tests/expiry/08_expiry_-c_expired_max+inact/expiry.exp	2010-08-26 19:13:30 UTC (rev 3234)
@@ -4,6 +4,7 @@
 expect_after default {puts "\nFAIL"; exit 1}
 
 spawn /bin/sh
+send "if \[ \$(id -u) -eq 0 \]; then PS1='# '; else PS1='$ '; fi\r"
 expect "# "
 
 send "expiry -c\r"

Modified: debian/trunk/tests/expiry/09_expiry_-c_expired_not_inactive/expiry.exp
===================================================================
--- debian/trunk/tests/expiry/09_expiry_-c_expired_not_inactive/expiry.exp	2010-08-22 19:36:09 UTC (rev 3233)
+++ debian/trunk/tests/expiry/09_expiry_-c_expired_not_inactive/expiry.exp	2010-08-26 19:13:30 UTC (rev 3234)
@@ -4,6 +4,7 @@
 expect_after default {puts "\nFAIL"; exit 1}
 
 spawn /bin/sh
+send "if \[ \$(id -u) -eq 0 \]; then PS1='# '; else PS1='$ '; fi\r"
 expect "# "
 
 send "expiry -c\r"