[Asterisk-code-review] testsuite: Add entries to conflicts.txt for voicemail (testsuite[master])

[Jenkins2]

Jenkins2 has submitted this change and it was merged. ( https://gerrit.asterisk.org/5642 )

Change subject: testsuite:  Add entries to conflicts.txt for voicemail
......................................................................


testsuite:  Add entries to conflicts.txt for voicemail

Currently Jenkins has to do 2 separate builds for gates and
periodics, one with app_voicemail but without res_mwi_external, and
one with res_mwi_external but without app_voicemail since those 2
modules conflict.  Having to do 2 builds however is now an issue
because we want to share the same build across all test runs.

* Added entries in conflicts.txt that prevent app_voicemail
  from loading if res_mwi_external or its related modules are a test
  dependency and that prevent res_mwi_external and its related
  modules from loading if app_voicemail is a test dependency.

* Tests that had explicit modules.conf.inc files to accomplish the
  same thing have been removed.

Change-Id: I8484e83de913f69fff305e8cb5570ebc75b13943
---
M configs/conflicts.txt
D tests/channels/pjsip/subscriptions/mwi/missing_aor/configs/ast1/modules.conf.inc
D tests/channels/pjsip/subscriptions/mwi/mwi_aggregate/configs/ast1/modules.conf.inc
D tests/channels/pjsip/subscriptions/mwi/no_accept_header/configs/ast1/modules.conf.inc
D tests/channels/pjsip/subscriptions/mwi/unsolicited/mailbox_count_changes/configs/ast1/modules.conf.inc
5 files changed, 3 insertions(+), 6 deletions(-)

Approvals:
  Kevin Harwell: Looks good to me, but someone else must approve
  Mark Michelson: Looks good to me, approved
  Jenkins2: Approved for Submit



diff --git a/configs/conflicts.txt b/configs/conflicts.txt
index 108c003..4c80cd6 100644
--- a/configs/conflicts.txt
+++ b/configs/conflicts.txt
@@ -12,3 +12,6 @@
 
 ;; and don't load chan_pjsip if the test uses chan_sip
 chan_sip=chan_pjsip.so,res_pjsip.so,res_pjsip_pubsub.so,res_pjsip_session.so,res_pjsip_outbound_publish.so
+
+app_voicemail=res_ari_mailboxes.so,res_mwi_external.so,res_mwi_external_ami.so,res_stasis_mailbox.so
+res_ari_mailboxes,res_mwi_external,res_mwi_external_ami,res_stasis_mailbox=app_voicemail.so
diff --git a/tests/channels/pjsip/subscriptions/mwi/missing_aor/configs/ast1/modules.conf.inc b/tests/channels/pjsip/subscriptions/mwi/missing_aor/configs/ast1/modules.conf.inc
deleted file mode 100644
index 652410e..0000000
--- a/tests/channels/pjsip/subscriptions/mwi/missing_aor/configs/ast1/modules.conf.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-noload => app_voicemail.so
-
diff --git a/tests/channels/pjsip/subscriptions/mwi/mwi_aggregate/configs/ast1/modules.conf.inc b/tests/channels/pjsip/subscriptions/mwi/mwi_aggregate/configs/ast1/modules.conf.inc
deleted file mode 100644
index cc465c6..0000000
--- a/tests/channels/pjsip/subscriptions/mwi/mwi_aggregate/configs/ast1/modules.conf.inc
+++ /dev/null
@@ -1 +0,0 @@
-noload => app_voicemail.so
diff --git a/tests/channels/pjsip/subscriptions/mwi/no_accept_header/configs/ast1/modules.conf.inc b/tests/channels/pjsip/subscriptions/mwi/no_accept_header/configs/ast1/modules.conf.inc
deleted file mode 100644
index 652410e..0000000
--- a/tests/channels/pjsip/subscriptions/mwi/no_accept_header/configs/ast1/modules.conf.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-noload => app_voicemail.so
-
diff --git a/tests/channels/pjsip/subscriptions/mwi/unsolicited/mailbox_count_changes/configs/ast1/modules.conf.inc b/tests/channels/pjsip/subscriptions/mwi/unsolicited/mailbox_count_changes/configs/ast1/modules.conf.inc
deleted file mode 100644
index cc465c6..0000000
--- a/tests/channels/pjsip/subscriptions/mwi/unsolicited/mailbox_count_changes/configs/ast1/modules.conf.inc
+++ /dev/null
@@ -1 +0,0 @@
-noload => app_voicemail.so

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8484e83de913f69fff305e8cb5570ebc75b13943
Gerrit-PatchSet: 2
Gerrit-Project: testsuite
Gerrit-Branch: master
Gerrit-Owner: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Jenkins2
Gerrit-Reviewer: Kevin Harwell <kharwell at digium.com>
Gerrit-Reviewer: Mark Michelson <mmichelson at digium.com>