<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/a0aaa2246af0264a70f5f809210ea68618ef2fbb">https://github.com/macports/macports-base/commit/a0aaa2246af0264a70f5f809210ea68618ef2fbb</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit a0aaa2246af0264a70f5f809210ea68618ef2fbb
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Tue Jun 16 22:50:34 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> Add more startupitems tests
</span>---
src/port1.0/tests/portstartupitem.test | 76 +++++++++++++++++++++++++++++-----
1 file changed, 66 insertions(+), 10 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/tests/portstartupitem.test b/src/port1.0/tests/portstartupitem.test
</span><span style='display:block; white-space:pre;color:#808080;'>index 65eb4b5c..440be91c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/tests/portstartupitem.test
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/tests/portstartupitem.test
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,25 +20,81 @@ macports_worker_init
</span> package require port 1.0
package require portstartupitem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-test startupitems {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- startupitems unit test. Check that the name seen in foreach_startupitem\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- is the same whether set via the startupitem.name option or via key+value\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- in the startupitems option.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test startupitems_executable {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Check that setting the startupitem.executable option behaves the\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ same as setting executable via the startupitems option.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} -setup {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set system_options(startupitem_install) yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} -body {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ startupitem.executable ${prefix}/sbin/mydaemon -flag1 "quoted string"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ portstartupitem::foreach_startupitem {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set single_result [list {*}$si_executable]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ startupitems \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ name testname \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ executable "${prefix}/sbin/mydaemon -flag1 \"quoted string\""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ portstartupitem::foreach_startupitem {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set multi_result [list {*}$si_executable]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$single_result ne $multi_result} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "ERROR: single_result = '$single_result' but multi_result = '$multi_result'"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "startupitems_executable successful."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} -cleanup {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ startupitems
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} -result "startupitems_executable successful."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test startupitems_name {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Check that setting the startupitem.name option behaves the\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ same as setting name via the startupitems option.
</span> } -setup {
set system_options(startupitem_install) yes
} -body {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- startupitem.name testname
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ startupitem.name testname
</span> portstartupitem::foreach_startupitem {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set single_result $si_name
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set single_result [list {*}$si_name]
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- startupitems name testname
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ startupitems \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ name testname
</span> portstartupitem::foreach_startupitem {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set multi_result $si_name
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set multi_result [list {*}$si_name]
</span> }
if {$single_result ne $multi_result} {
return "ERROR: single_result = '$single_result' but multi_result = '$multi_result'"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "startupitems successful."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} -result "startupitems successful."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "startupitems_name successful."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} -cleanup {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ startupitems
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} -result "startupitems_name successful."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test startupitems_start {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Check that setting the startupitem.start option behaves the\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ same as setting start via the startupitems option.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} -setup {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set system_options(startupitem_install) yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} -body {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ startupitem.start "${prefix}/sbin/daemon1 start -flag1 \"quoted string\"" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${prefix}/sbin/daemon2 start -flag2 -flag3"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ portstartupitem::foreach_startupitem {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set single_result [list {*}$si_start]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ startupitems \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ name testname \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ start "\"${prefix}/sbin/daemon1 start -flag1 \\\"quoted string\\\"\" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \"${prefix}/sbin/daemon2 start -flag2 -flag3\""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ portstartupitem::foreach_startupitem {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set multi_result [list {*}$si_start]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$single_result ne $multi_result} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "ERROR: single_result = '$single_result' but multi_result = '$multi_result'"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "startupitems_start successful."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} -cleanup {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ startupitems
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} -result "startupitems_start successful."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>
cleanupTests
</pre><pre style='margin:0'>
</pre>