<p>Jenkins2 <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/8540">View Change</a></p><div style="white-space:pre-wrap">Approvals:
George Joseph: Looks good to me, approved
Jenkins2: Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Branching: Move tests up a directory level<br><br>The following tests were moved up one directory level due to them now being the<br>only tests in that directory:<br><br>SIP/redirecting_reason/v13.8.0/ -> SIP/redirecting_reason<br>refer_send_to_vm/v13.8.0 -> refer_send_to_vm/<br><br>Change-Id: Ic4909330786172331410bdb4b6c655f295279c22<br>(cherry picked from commit c29af291338a526fd5e718bc043dcf96ec905437)<br>---<br>R tests/channels/SIP/redirecting_reason/configs/ast1/extensions.conf<br>R tests/channels/SIP/redirecting_reason/configs/ast1/sip.conf<br>R tests/channels/SIP/redirecting_reason/sipp/uac-diversion.xml<br>R tests/channels/SIP/redirecting_reason/sipp/uac-no-hangup.xml<br>R tests/channels/SIP/redirecting_reason/sipp/uas-480.xml<br>R tests/channels/SIP/redirecting_reason/sipp/uas-redirect.xml<br>R tests/channels/SIP/redirecting_reason/test-config.yaml<br>D tests/channels/SIP/redirecting_reason/tests.yaml<br>M tests/channels/SIP/tests.yaml<br>R tests/channels/pjsip/refer_send_to_vm/configs/ast1/extensions.conf<br>R tests/channels/pjsip/refer_send_to_vm/configs/ast1/pjsip.conf<br>R tests/channels/pjsip/refer_send_to_vm/sipp/invite.xml<br>R tests/channels/pjsip/refer_send_to_vm/sipp/refer.xml<br>R tests/channels/pjsip/refer_send_to_vm/sipp/refer_unquoted_send_to_vm.xml<br>R tests/channels/pjsip/refer_send_to_vm/test-config.yaml<br>D tests/channels/pjsip/refer_send_to_vm/tests.yaml<br>M tests/channels/pjsip/tests.yaml<br>17 files changed, 2 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/tests/channels/SIP/redirecting_reason/v13.8.0/configs/ast1/extensions.conf b/tests/channels/SIP/redirecting_reason/configs/ast1/extensions.conf<br>similarity index 100%<br>rename from tests/channels/SIP/redirecting_reason/v13.8.0/configs/ast1/extensions.conf<br>rename to tests/channels/SIP/redirecting_reason/configs/ast1/extensions.conf<br>diff --git a/tests/channels/SIP/redirecting_reason/v13.8.0/configs/ast1/sip.conf b/tests/channels/SIP/redirecting_reason/configs/ast1/sip.conf<br>similarity index 100%<br>rename from tests/channels/SIP/redirecting_reason/v13.8.0/configs/ast1/sip.conf<br>rename to tests/channels/SIP/redirecting_reason/configs/ast1/sip.conf<br>diff --git a/tests/channels/SIP/redirecting_reason/v13.8.0/sipp/uac-diversion.xml b/tests/channels/SIP/redirecting_reason/sipp/uac-diversion.xml<br>similarity index 100%<br>rename from tests/channels/SIP/redirecting_reason/v13.8.0/sipp/uac-diversion.xml<br>rename to tests/channels/SIP/redirecting_reason/sipp/uac-diversion.xml<br>diff --git a/tests/channels/SIP/redirecting_reason/v13.8.0/sipp/uac-no-hangup.xml b/tests/channels/SIP/redirecting_reason/sipp/uac-no-hangup.xml<br>similarity index 100%<br>rename from tests/channels/SIP/redirecting_reason/v13.8.0/sipp/uac-no-hangup.xml<br>rename to tests/channels/SIP/redirecting_reason/sipp/uac-no-hangup.xml<br>diff --git a/tests/channels/SIP/redirecting_reason/v13.8.0/sipp/uas-480.xml b/tests/channels/SIP/redirecting_reason/sipp/uas-480.xml<br>similarity index 100%<br>rename from tests/channels/SIP/redirecting_reason/v13.8.0/sipp/uas-480.xml<br>rename to tests/channels/SIP/redirecting_reason/sipp/uas-480.xml<br>diff --git a/tests/channels/SIP/redirecting_reason/v13.8.0/sipp/uas-redirect.xml b/tests/channels/SIP/redirecting_reason/sipp/uas-redirect.xml<br>similarity index 100%<br>rename from tests/channels/SIP/redirecting_reason/v13.8.0/sipp/uas-redirect.xml<br>rename to tests/channels/SIP/redirecting_reason/sipp/uas-redirect.xml<br>diff --git a/tests/channels/SIP/redirecting_reason/v13.8.0/test-config.yaml b/tests/channels/SIP/redirecting_reason/test-config.yaml<br>similarity index 100%<br>rename from tests/channels/SIP/redirecting_reason/v13.8.0/test-config.yaml<br>rename to tests/channels/SIP/redirecting_reason/test-config.yaml<br>diff --git a/tests/channels/SIP/redirecting_reason/tests.yaml b/tests/channels/SIP/redirecting_reason/tests.yaml<br>deleted file mode 100644<br>index 565b4bb..0000000<br>--- a/tests/channels/SIP/redirecting_reason/tests.yaml<br>+++ /dev/null<br>@@ -1,3 +0,0 @@<br>-# Enter tests here in the order they should be considered for execution:<br>-tests:<br>- - test: 'v13.8.0'<br>diff --git a/tests/channels/SIP/tests.yaml b/tests/channels/SIP/tests.yaml<br>index a572dc1..f71357f 100644<br>--- a/tests/channels/SIP/tests.yaml<br>+++ b/tests/channels/SIP/tests.yaml<br>@@ -1,7 +1,6 @@<br> # Enter tests here in the order they should be considered for execution:<br> tests:<br> - dir: 'ami'<br>- - dir: 'redirecting_reason'<br> - dir: 'register_forbidden_retry'<br> - dir: 'sendrpid'<br> - dir: 'session_timers'<br>@@ -44,6 +43,7 @@<br> - test: 'pcap_demo'<br> - test: 'realtime_nosipregs'<br> - test: 'realtime_sipregs'<br>+ - test: 'redirecting_reason'<br> - test: 'refer_replaces_to_self'<br> - test: 'rfc2833_dtmf_detect'<br> - test: 'route'<br>diff --git a/tests/channels/pjsip/refer_send_to_vm/v13.8.0/configs/ast1/extensions.conf b/tests/channels/pjsip/refer_send_to_vm/configs/ast1/extensions.conf<br>similarity index 100%<br>rename from tests/channels/pjsip/refer_send_to_vm/v13.8.0/configs/ast1/extensions.conf<br>rename to tests/channels/pjsip/refer_send_to_vm/configs/ast1/extensions.conf<br>diff --git a/tests/channels/pjsip/refer_send_to_vm/v13.8.0/configs/ast1/pjsip.conf b/tests/channels/pjsip/refer_send_to_vm/configs/ast1/pjsip.conf<br>similarity index 100%<br>rename from tests/channels/pjsip/refer_send_to_vm/v13.8.0/configs/ast1/pjsip.conf<br>rename to tests/channels/pjsip/refer_send_to_vm/configs/ast1/pjsip.conf<br>diff --git a/tests/channels/pjsip/refer_send_to_vm/v13.8.0/sipp/invite.xml b/tests/channels/pjsip/refer_send_to_vm/sipp/invite.xml<br>similarity index 100%<br>rename from tests/channels/pjsip/refer_send_to_vm/v13.8.0/sipp/invite.xml<br>rename to tests/channels/pjsip/refer_send_to_vm/sipp/invite.xml<br>diff --git a/tests/channels/pjsip/refer_send_to_vm/v13.8.0/sipp/refer.xml b/tests/channels/pjsip/refer_send_to_vm/sipp/refer.xml<br>similarity index 100%<br>rename from tests/channels/pjsip/refer_send_to_vm/v13.8.0/sipp/refer.xml<br>rename to tests/channels/pjsip/refer_send_to_vm/sipp/refer.xml<br>diff --git a/tests/channels/pjsip/refer_send_to_vm/v13.8.0/sipp/refer_unquoted_send_to_vm.xml b/tests/channels/pjsip/refer_send_to_vm/sipp/refer_unquoted_send_to_vm.xml<br>similarity index 100%<br>rename from tests/channels/pjsip/refer_send_to_vm/v13.8.0/sipp/refer_unquoted_send_to_vm.xml<br>rename to tests/channels/pjsip/refer_send_to_vm/sipp/refer_unquoted_send_to_vm.xml<br>diff --git a/tests/channels/pjsip/refer_send_to_vm/v13.8.0/test-config.yaml b/tests/channels/pjsip/refer_send_to_vm/test-config.yaml<br>similarity index 100%<br>rename from tests/channels/pjsip/refer_send_to_vm/v13.8.0/test-config.yaml<br>rename to tests/channels/pjsip/refer_send_to_vm/test-config.yaml<br>diff --git a/tests/channels/pjsip/refer_send_to_vm/tests.yaml b/tests/channels/pjsip/refer_send_to_vm/tests.yaml<br>deleted file mode 100644<br>index 565b4bb..0000000<br>--- a/tests/channels/pjsip/refer_send_to_vm/tests.yaml<br>+++ /dev/null<br>@@ -1,3 +0,0 @@<br>-# Enter tests here in the order they should be considered for execution:<br>-tests:<br>- - test: 'v13.8.0'<br>diff --git a/tests/channels/pjsip/tests.yaml b/tests/channels/pjsip/tests.yaml<br>index 435455e..681bda2 100644<br>--- a/tests/channels/pjsip/tests.yaml<br>+++ b/tests/channels/pjsip/tests.yaml<br>@@ -13,7 +13,6 @@<br> - dir: 'one_touch_recording'<br> - dir: 'publish'<br> - dir: 'qualify'<br>- - dir: 'refer_send_to_vm'<br> - dir: 'registration'<br> - dir: 'resolver'<br> - dir: 'rtp'<br>@@ -44,6 +43,7 @@<br> - test: 'info_dtmf'<br> - test: 'info_empty'<br> - test: 'keep_alive'<br>+ - test: 'refer_send_to_vm'<br> - test: 'reinvite_early'<br> - test: 'reinvite_pending'<br> - test: 'rpid_immediate'<br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/8540">change 8540</a>. To unsubscribe, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/8540"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: testsuite </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ic4909330786172331410bdb4b6c655f295279c22 </div>
<div style="display:none"> Gerrit-Change-Number: 8540 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Kevin Harwell <kharwell@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Corey Farrell <git@cfware.com> </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 </div>