[Asterisk-code-review] Branching: Move tests up a directory level (testsuite[newmaster])

Thu Mar 8 11:26:18 CST 2018

Kevin Harwell has submitted this change and it was merged. ( https://gerrit.asterisk.org/8093 )

Change subject: Branching: Move tests up a directory level
......................................................................

Branching: Move tests up a directory level

The following tests were moved up one directory level due to them now being the
only tests in that directory:

SIP/redirecting_reason/v13.8.0/ -> SIP/redirecting_reason
refer_send_to_vm/v13.8.0 -> refer_send_to_vm/

Change-Id: Ic4909330786172331410bdb4b6c655f295279c22
---
R tests/channels/SIP/redirecting_reason/configs/ast1/extensions.conf
R tests/channels/SIP/redirecting_reason/configs/ast1/sip.conf
R tests/channels/SIP/redirecting_reason/sipp/uac-diversion.xml
R tests/channels/SIP/redirecting_reason/sipp/uac-no-hangup.xml
R tests/channels/SIP/redirecting_reason/sipp/uas-480.xml
R tests/channels/SIP/redirecting_reason/sipp/uas-redirect.xml
R tests/channels/SIP/redirecting_reason/test-config.yaml
D tests/channels/SIP/redirecting_reason/tests.yaml
M tests/channels/SIP/tests.yaml
R tests/channels/pjsip/refer_send_to_vm/configs/ast1/extensions.conf
R tests/channels/pjsip/refer_send_to_vm/configs/ast1/pjsip.conf
R tests/channels/pjsip/refer_send_to_vm/sipp/invite.xml
R tests/channels/pjsip/refer_send_to_vm/sipp/refer.xml
R tests/channels/pjsip/refer_send_to_vm/sipp/refer_unquoted_send_to_vm.xml
R tests/channels/pjsip/refer_send_to_vm/test-config.yaml
D tests/channels/pjsip/refer_send_to_vm/tests.yaml
M tests/channels/pjsip/tests.yaml
17 files changed, 2 insertions(+), 8 deletions(-)

Approvals:
  Corey Farrell: Looks good to me, but someone else must approve
  Joshua Colp: Looks good to me, but someone else must approve; Verified
  Kevin Harwell: Looks good to me, approved; Approved for Submit

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
similarity index 100%
rename from tests/channels/SIP/redirecting_reason/v13.8.0/configs/ast1/extensions.conf
rename to tests/channels/SIP/redirecting_reason/configs/ast1/extensions.conf
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
similarity index 100%
rename from tests/channels/SIP/redirecting_reason/v13.8.0/configs/ast1/sip.conf
rename to tests/channels/SIP/redirecting_reason/configs/ast1/sip.conf
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
similarity index 100%
rename from tests/channels/SIP/redirecting_reason/v13.8.0/sipp/uac-diversion.xml
rename to tests/channels/SIP/redirecting_reason/sipp/uac-diversion.xml
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
similarity index 100%
rename from tests/channels/SIP/redirecting_reason/v13.8.0/sipp/uac-no-hangup.xml
rename to tests/channels/SIP/redirecting_reason/sipp/uac-no-hangup.xml
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
similarity index 100%
rename from tests/channels/SIP/redirecting_reason/v13.8.0/sipp/uas-480.xml
rename to tests/channels/SIP/redirecting_reason/sipp/uas-480.xml
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
similarity index 100%
rename from tests/channels/SIP/redirecting_reason/v13.8.0/sipp/uas-redirect.xml
rename to tests/channels/SIP/redirecting_reason/sipp/uas-redirect.xml
diff --git a/tests/channels/SIP/redirecting_reason/v13.8.0/test-config.yaml b/tests/channels/SIP/redirecting_reason/test-config.yaml
similarity index 100%
rename from tests/channels/SIP/redirecting_reason/v13.8.0/test-config.yaml
rename to tests/channels/SIP/redirecting_reason/test-config.yaml
diff --git a/tests/channels/SIP/redirecting_reason/tests.yaml b/tests/channels/SIP/redirecting_reason/tests.yaml
deleted file mode 100644
index 565b4bb..0000000
--- a/tests/channels/SIP/redirecting_reason/tests.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-# Enter tests here in the order they should be considered for execution:
-tests:
-    - test: 'v13.8.0'
diff --git a/tests/channels/SIP/tests.yaml b/tests/channels/SIP/tests.yaml
index a572dc1..f71357f 100644
--- a/tests/channels/SIP/tests.yaml
+++ b/tests/channels/SIP/tests.yaml
@@ -1,7 +1,6 @@
 # Enter tests here in the order they should be considered for execution:
 tests:
     - dir: 'ami'
-    - dir: 'redirecting_reason'
     - dir: 'register_forbidden_retry'
     - dir: 'sendrpid'
     - dir: 'session_timers'
@@ -44,6 +43,7 @@
     - test: 'pcap_demo'
     - test: 'realtime_nosipregs'
     - test: 'realtime_sipregs'
+    - test: 'redirecting_reason'
     - test: 'refer_replaces_to_self'
     - test: 'rfc2833_dtmf_detect'
     - test: 'route'
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
similarity index 100%
rename from tests/channels/pjsip/refer_send_to_vm/v13.8.0/configs/ast1/extensions.conf
rename to tests/channels/pjsip/refer_send_to_vm/configs/ast1/extensions.conf
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
similarity index 100%
rename from tests/channels/pjsip/refer_send_to_vm/v13.8.0/configs/ast1/pjsip.conf
rename to tests/channels/pjsip/refer_send_to_vm/configs/ast1/pjsip.conf
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
similarity index 100%
rename from tests/channels/pjsip/refer_send_to_vm/v13.8.0/sipp/invite.xml
rename to tests/channels/pjsip/refer_send_to_vm/sipp/invite.xml
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
similarity index 100%
rename from tests/channels/pjsip/refer_send_to_vm/v13.8.0/sipp/refer.xml
rename to tests/channels/pjsip/refer_send_to_vm/sipp/refer.xml
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
similarity index 100%
rename from tests/channels/pjsip/refer_send_to_vm/v13.8.0/sipp/refer_unquoted_send_to_vm.xml
rename to tests/channels/pjsip/refer_send_to_vm/sipp/refer_unquoted_send_to_vm.xml
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
similarity index 100%
rename from tests/channels/pjsip/refer_send_to_vm/v13.8.0/test-config.yaml
rename to tests/channels/pjsip/refer_send_to_vm/test-config.yaml
diff --git a/tests/channels/pjsip/refer_send_to_vm/tests.yaml b/tests/channels/pjsip/refer_send_to_vm/tests.yaml
deleted file mode 100644
index 565b4bb..0000000
--- a/tests/channels/pjsip/refer_send_to_vm/tests.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-# Enter tests here in the order they should be considered for execution:
-tests:
-    - test: 'v13.8.0'
diff --git a/tests/channels/pjsip/tests.yaml b/tests/channels/pjsip/tests.yaml
index 435455e..681bda2 100644
--- a/tests/channels/pjsip/tests.yaml
+++ b/tests/channels/pjsip/tests.yaml
@@ -13,7 +13,6 @@
     - dir: 'one_touch_recording'
     - dir: 'publish'
     - dir: 'qualify'
-    - dir: 'refer_send_to_vm'
     - dir: 'registration'
     - dir: 'resolver'
     - dir: 'rtp'
@@ -44,6 +43,7 @@
     - test: 'info_dtmf'
     - test: 'info_empty'
     - test: 'keep_alive'
+    - test: 'refer_send_to_vm'
     - test: 'reinvite_early'
     - test: 'reinvite_pending'
     - test: 'rpid_immediate'

-- 
To view, visit https://gerrit.asterisk.org/8093
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-Project: testsuite
Gerrit-Branch: newmaster
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic4909330786172331410bdb4b6c655f295279c22
Gerrit-Change-Number: 8093
Gerrit-PatchSet: 1
Gerrit-Owner: Kevin Harwell <kharwell at digium.com>
Gerrit-Reviewer: Corey Farrell <git at cfware.com>
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Kevin Harwell <kharwell at digium.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20180308/ca44fce8/attachment.html>
