[asterisk-commits] Move extra modules.conf settings to modules.conf.inc. (testsuite[master])

Tue Jun 23 06:46:53 CDT 2015

Matt Jordan has submitted this change and it was merged.

Change subject: Move extra modules.conf settings to modules.conf.inc.
......................................................................


Move extra modules.conf settings to modules.conf.inc.

This change creates a separate file for tests to define extra
settings for modules.conf.  This avoids overwriting the default
modules.conf settings.

Change-Id: I6cf431d0ea110293f766c1e070050914d75b6611
---
M configs/modules.conf
A configs/modules.conf.inc
R tests/apps/queues/queue_baseline/configs/ast1/modules.conf.inc
D tests/cdr/app_queue/configs/ast1/modules.conf
A tests/cdr/app_queue/configs/ast1/modules.conf.inc
D tests/channels/SIP/acl_call/configs/ast1/modules.conf
A tests/channels/SIP/acl_call/configs/ast1/modules.conf.inc
D tests/channels/SIP/noload_res_srtp/configs/modules.conf
A tests/channels/SIP/noload_res_srtp/configs/modules.conf.inc
D tests/channels/SIP/noload_res_srtp_attempt_srtp/configs/ast2/modules.conf
A tests/channels/SIP/noload_res_srtp_attempt_srtp/configs/ast2/modules.conf.inc
D tests/channels/iax2/acl_call/configs/ast1/modules.conf
A tests/channels/iax2/acl_call/configs/ast1/modules.conf.inc
R tests/channels/pjsip/basic_calls/incoming/off-nominal/incompatible_codecs/configs/ast1/modules.conf.inc
D tests/channels/pjsip/message/message_context/configs/ast1/modules.conf
D tests/channels/pjsip/subscriptions/mwi/missing_aor/configs/ast1/modules.conf
A tests/channels/pjsip/subscriptions/mwi/missing_aor/configs/ast1/modules.conf.inc
D tests/channels/pjsip/subscriptions/mwi/mwi_aggregate/configs/ast1/modules.conf
A 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
A tests/channels/pjsip/subscriptions/mwi/no_accept_header/configs/ast1/modules.conf.inc
D tests/channels/pjsip/subscriptions/mwi/sub_setup_teardown/configs/ast1/modules.conf
D tests/channels/pjsip/subscriptions/mwi/unsolicited/mailbox_count_changes/configs/ast1/modules.conf
A tests/channels/pjsip/subscriptions/mwi/unsolicited/mailbox_count_changes/configs/ast1/modules.conf.inc
D tests/channels/pjsip/subscriptions/presence/presence_pidf/configs/ast1/modules.conf
A tests/channels/pjsip/subscriptions/presence/presence_pidf/configs/ast1/modules.conf.inc
D tests/channels/pjsip/subscriptions/presence/presence_xpidf/configs/ast1/modules.conf
A tests/channels/pjsip/subscriptions/presence/presence_xpidf/configs/ast1/modules.conf.inc
D tests/channels/pjsip/subscriptions/presence/resubscribe/configs/ast1/modules.conf
A tests/channels/pjsip/subscriptions/presence/resubscribe/configs/ast1/modules.conf.inc
D tests/channels/pjsip/subscriptions/presence/unsubscribe/configs/ast1/modules.conf
A tests/channels/pjsip/subscriptions/presence/unsubscribe/configs/ast1/modules.conf.inc
D tests/realtime/static/configs/ast1/modules.conf
A tests/realtime/static/configs/ast1/modules.conf.inc
34 files changed, 22 insertions(+), 146 deletions(-)

Approvals:
  Matt Jordan: Looks good to me, approved; Verified
  Joshua Colp: Looks good to me, but someone else must approve

diff --git a/configs/modules.conf b/configs/modules.conf
index 27ba051..b1fa95b 100644
--- a/configs/modules.conf
+++ b/configs/modules.conf
@@ -7,4 +7,5 @@
 noload => chan_alsa.so
 noload => chan_oss.so
 noload => chan_console.so
+#include "modules.conf.inc"
 
diff --git a/configs/modules.conf.inc b/configs/modules.conf.inc
new file mode 100644
index 0000000..90b4a88
--- /dev/null
+++ b/configs/modules.conf.inc
@@ -0,0 +1 @@
+; Do not delete
diff --git a/tests/apps/queues/queue_baseline/configs/ast1/modules.conf b/tests/apps/queues/queue_baseline/configs/ast1/modules.conf.inc
similarity index 67%
rename from tests/apps/queues/queue_baseline/configs/ast1/modules.conf
rename to tests/apps/queues/queue_baseline/configs/ast1/modules.conf.inc
index c19a305..b1135a1 100644
--- a/tests/apps/queues/queue_baseline/configs/ast1/modules.conf
+++ b/tests/apps/queues/queue_baseline/configs/ast1/modules.conf.inc
@@ -1,16 +1,9 @@
-[modules]
-
-autoload => yes
 ;We need to preload chan_local and pbx_config
 ;so that the lone queue member doesn't appear as "Invalid"
 ;and thus prevent the caller from entering the queue.
 preload => chan_local.so
 preload => pbx_config.so
 
-noload => chan_alsa.so
-noload => chan_oss.so
-
 noload => app_directory.so
-noload => app_voicemail_odbcstorage.so
 
 
diff --git a/tests/cdr/app_queue/configs/ast1/modules.conf b/tests/cdr/app_queue/configs/ast1/modules.conf
deleted file mode 100644
index d9d147a..0000000
--- a/tests/cdr/app_queue/configs/ast1/modules.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-
-[modules]
-autoload=yes
-load => res_musiconhold.so
-load => chan_sip.so
-load => app_queue.so
-
-noload => pbx_gtkconsole.so
-noload => chan_alsa.so
-noload => chan_oss.so
-noload => chan_console.so
diff --git a/tests/cdr/app_queue/configs/ast1/modules.conf.inc b/tests/cdr/app_queue/configs/ast1/modules.conf.inc
new file mode 100644
index 0000000..8e029d2
--- /dev/null
+++ b/tests/cdr/app_queue/configs/ast1/modules.conf.inc
@@ -0,0 +1,3 @@
+load => res_musiconhold.so
+load => chan_sip.so
+load => app_queue.so
diff --git a/tests/channels/SIP/acl_call/configs/ast1/modules.conf b/tests/channels/SIP/acl_call/configs/ast1/modules.conf
deleted file mode 100644
index eeec5bf..0000000
--- a/tests/channels/SIP/acl_call/configs/ast1/modules.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-[modules]
-autoload=yes
-preload => res_config_sqlite3.so
-
-noload => chan_alsa.so
-noload => chan_console.so
-noload => pbx_gtkconsole.so
diff --git a/tests/channels/SIP/acl_call/configs/ast1/modules.conf.inc b/tests/channels/SIP/acl_call/configs/ast1/modules.conf.inc
new file mode 100644
index 0000000..161ad33
--- /dev/null
+++ b/tests/channels/SIP/acl_call/configs/ast1/modules.conf.inc
@@ -0,0 +1 @@
+preload => res_config_sqlite3.so
diff --git a/tests/channels/SIP/noload_res_srtp/configs/modules.conf b/tests/channels/SIP/noload_res_srtp/configs/modules.conf
deleted file mode 100644
index 53c446d..0000000
--- a/tests/channels/SIP/noload_res_srtp/configs/modules.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-[modules]
-autoload=yes
-noload => pbx_gtkconsole.so
-load => res_musiconhold.so
-noload => chan_alsa.so
-noload => res_srtp.so
diff --git a/tests/channels/SIP/noload_res_srtp/configs/modules.conf.inc b/tests/channels/SIP/noload_res_srtp/configs/modules.conf.inc
new file mode 100644
index 0000000..9e8ac1b
--- /dev/null
+++ b/tests/channels/SIP/noload_res_srtp/configs/modules.conf.inc
@@ -0,0 +1,2 @@
+load => res_musiconhold.so
+noload => res_srtp.so
diff --git a/tests/channels/SIP/noload_res_srtp_attempt_srtp/configs/ast2/modules.conf b/tests/channels/SIP/noload_res_srtp_attempt_srtp/configs/ast2/modules.conf
deleted file mode 100644
index 53c446d..0000000
--- a/tests/channels/SIP/noload_res_srtp_attempt_srtp/configs/ast2/modules.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-[modules]
-autoload=yes
-noload => pbx_gtkconsole.so
-load => res_musiconhold.so
-noload => chan_alsa.so
-noload => res_srtp.so
diff --git a/tests/channels/SIP/noload_res_srtp_attempt_srtp/configs/ast2/modules.conf.inc b/tests/channels/SIP/noload_res_srtp_attempt_srtp/configs/ast2/modules.conf.inc
new file mode 100644
index 0000000..9e8ac1b
--- /dev/null
+++ b/tests/channels/SIP/noload_res_srtp_attempt_srtp/configs/ast2/modules.conf.inc
@@ -0,0 +1,2 @@
+load => res_musiconhold.so
+noload => res_srtp.so
diff --git a/tests/channels/iax2/acl_call/configs/ast1/modules.conf b/tests/channels/iax2/acl_call/configs/ast1/modules.conf
deleted file mode 100644
index eeec5bf..0000000
--- a/tests/channels/iax2/acl_call/configs/ast1/modules.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-[modules]
-autoload=yes
-preload => res_config_sqlite3.so
-
-noload => chan_alsa.so
-noload => chan_console.so
-noload => pbx_gtkconsole.so
diff --git a/tests/channels/iax2/acl_call/configs/ast1/modules.conf.inc b/tests/channels/iax2/acl_call/configs/ast1/modules.conf.inc
new file mode 100644
index 0000000..161ad33
--- /dev/null
+++ b/tests/channels/iax2/acl_call/configs/ast1/modules.conf.inc
@@ -0,0 +1 @@
+preload => res_config_sqlite3.so
diff --git a/tests/channels/pjsip/basic_calls/incoming/off-nominal/incompatible_codecs/configs/ast1/modules.conf b/tests/channels/pjsip/basic_calls/incoming/off-nominal/incompatible_codecs/configs/ast1/modules.conf.inc
similarity index 93%
rename from tests/channels/pjsip/basic_calls/incoming/off-nominal/incompatible_codecs/configs/ast1/modules.conf
rename to tests/channels/pjsip/basic_calls/incoming/off-nominal/incompatible_codecs/configs/ast1/modules.conf.inc
index 675bafa..4aeda6f 100644
--- a/tests/channels/pjsip/basic_calls/incoming/off-nominal/incompatible_codecs/configs/ast1/modules.conf
+++ b/tests/channels/pjsip/basic_calls/incoming/off-nominal/incompatible_codecs/configs/ast1/modules.conf.inc
@@ -1,7 +1,3 @@
-[modules]
-
-autoload = yes
-
 ; Minimize open fds in this test by not loading other VoIP channel drivers
 noload => chan_iax2.so
 noload => chan_mgcp.so
diff --git a/tests/channels/pjsip/message/message_context/configs/ast1/modules.conf b/tests/channels/pjsip/message/message_context/configs/ast1/modules.conf
deleted file mode 100644
index a01e3e7..0000000
--- a/tests/channels/pjsip/message/message_context/configs/ast1/modules.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-[modules]
-
-noload => chan_sip.so
-
-autoload => yes
diff --git a/tests/channels/pjsip/subscriptions/mwi/missing_aor/configs/ast1/modules.conf b/tests/channels/pjsip/subscriptions/mwi/missing_aor/configs/ast1/modules.conf
deleted file mode 100644
index 9eec22c..0000000
--- a/tests/channels/pjsip/subscriptions/mwi/missing_aor/configs/ast1/modules.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-[modules]
-autoload=yes
-
-noload => pbx_gtkconsole.so
-noload => chan_alsa.so
-noload => chan_oss.so
-noload => chan_console.so
-
-noload => chan_sip.so
-noload => 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
new file mode 100644
index 0000000..652410e
--- /dev/null
+++ b/tests/channels/pjsip/subscriptions/mwi/missing_aor/configs/ast1/modules.conf.inc
@@ -0,0 +1,2 @@
+noload => app_voicemail.so
+
diff --git a/tests/channels/pjsip/subscriptions/mwi/mwi_aggregate/configs/ast1/modules.conf b/tests/channels/pjsip/subscriptions/mwi/mwi_aggregate/configs/ast1/modules.conf
deleted file mode 100644
index a2360c4..0000000
--- a/tests/channels/pjsip/subscriptions/mwi/mwi_aggregate/configs/ast1/modules.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-[modules]
-autoload=yes
-
-noload => chan_alsa.so
-noload => chan_oss.so
-noload => chan_console.so
-noload => chan_sip.so
-
-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
new file mode 100644
index 0000000..cc465c6
--- /dev/null
+++ b/tests/channels/pjsip/subscriptions/mwi/mwi_aggregate/configs/ast1/modules.conf.inc
@@ -0,0 +1 @@
+noload => app_voicemail.so
diff --git a/tests/channels/pjsip/subscriptions/mwi/no_accept_header/configs/ast1/modules.conf b/tests/channels/pjsip/subscriptions/mwi/no_accept_header/configs/ast1/modules.conf
deleted file mode 100644
index 9eec22c..0000000
--- a/tests/channels/pjsip/subscriptions/mwi/no_accept_header/configs/ast1/modules.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-[modules]
-autoload=yes
-
-noload => pbx_gtkconsole.so
-noload => chan_alsa.so
-noload => chan_oss.so
-noload => chan_console.so
-
-noload => chan_sip.so
-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
new file mode 100644
index 0000000..652410e
--- /dev/null
+++ b/tests/channels/pjsip/subscriptions/mwi/no_accept_header/configs/ast1/modules.conf.inc
@@ -0,0 +1,2 @@
+noload => app_voicemail.so
+
diff --git a/tests/channels/pjsip/subscriptions/mwi/sub_setup_teardown/configs/ast1/modules.conf b/tests/channels/pjsip/subscriptions/mwi/sub_setup_teardown/configs/ast1/modules.conf
deleted file mode 100644
index e9c2583..0000000
--- a/tests/channels/pjsip/subscriptions/mwi/sub_setup_teardown/configs/ast1/modules.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-[modules]
-autoload=yes
-
-noload => chan_alsa.so
-noload => chan_oss.so
-noload => chan_console.so
-noload => chan_sip.so
-
diff --git a/tests/channels/pjsip/subscriptions/mwi/unsolicited/mailbox_count_changes/configs/ast1/modules.conf b/tests/channels/pjsip/subscriptions/mwi/unsolicited/mailbox_count_changes/configs/ast1/modules.conf
deleted file mode 100644
index a2360c4..0000000
--- a/tests/channels/pjsip/subscriptions/mwi/unsolicited/mailbox_count_changes/configs/ast1/modules.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-[modules]
-autoload=yes
-
-noload => chan_alsa.so
-noload => chan_oss.so
-noload => chan_console.so
-noload => chan_sip.so
-
-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
new file mode 100644
index 0000000..cc465c6
--- /dev/null
+++ b/tests/channels/pjsip/subscriptions/mwi/unsolicited/mailbox_count_changes/configs/ast1/modules.conf.inc
@@ -0,0 +1 @@
+noload => app_voicemail.so
diff --git a/tests/channels/pjsip/subscriptions/presence/presence_pidf/configs/ast1/modules.conf b/tests/channels/pjsip/subscriptions/presence/presence_pidf/configs/ast1/modules.conf
deleted file mode 100644
index 0aaf4bf..0000000
--- a/tests/channels/pjsip/subscriptions/presence/presence_pidf/configs/ast1/modules.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-[modules]
-autoload=yes
-
-noload => chan_alsa.so
-noload => chan_oss.so
-noload => chan_console.so
-noload => chan_sip.so
-
-noload => res_pjsip_xpidf_body_generator.so
diff --git a/tests/channels/pjsip/subscriptions/presence/presence_pidf/configs/ast1/modules.conf.inc b/tests/channels/pjsip/subscriptions/presence/presence_pidf/configs/ast1/modules.conf.inc
new file mode 100644
index 0000000..df4b88d
--- /dev/null
+++ b/tests/channels/pjsip/subscriptions/presence/presence_pidf/configs/ast1/modules.conf.inc
@@ -0,0 +1 @@
+noload => res_pjsip_xpidf_body_generator.so
diff --git a/tests/channels/pjsip/subscriptions/presence/presence_xpidf/configs/ast1/modules.conf b/tests/channels/pjsip/subscriptions/presence/presence_xpidf/configs/ast1/modules.conf
deleted file mode 100644
index 1556fbc..0000000
--- a/tests/channels/pjsip/subscriptions/presence/presence_xpidf/configs/ast1/modules.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-[modules]
-autoload=yes
-
-noload => chan_alsa.so
-noload => chan_oss.so
-noload => chan_console.so
-noload => chan_sip.so
-
-noload => res_pjsip_pidf_body_generator.so
diff --git a/tests/channels/pjsip/subscriptions/presence/presence_xpidf/configs/ast1/modules.conf.inc b/tests/channels/pjsip/subscriptions/presence/presence_xpidf/configs/ast1/modules.conf.inc
new file mode 100644
index 0000000..3ff6a31
--- /dev/null
+++ b/tests/channels/pjsip/subscriptions/presence/presence_xpidf/configs/ast1/modules.conf.inc
@@ -0,0 +1 @@
+noload => res_pjsip_pidf_body_generator.so
diff --git a/tests/channels/pjsip/subscriptions/presence/resubscribe/configs/ast1/modules.conf b/tests/channels/pjsip/subscriptions/presence/resubscribe/configs/ast1/modules.conf
deleted file mode 100644
index 0aaf4bf..0000000
--- a/tests/channels/pjsip/subscriptions/presence/resubscribe/configs/ast1/modules.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-[modules]
-autoload=yes
-
-noload => chan_alsa.so
-noload => chan_oss.so
-noload => chan_console.so
-noload => chan_sip.so
-
-noload => res_pjsip_xpidf_body_generator.so
diff --git a/tests/channels/pjsip/subscriptions/presence/resubscribe/configs/ast1/modules.conf.inc b/tests/channels/pjsip/subscriptions/presence/resubscribe/configs/ast1/modules.conf.inc
new file mode 100644
index 0000000..df4b88d
--- /dev/null
+++ b/tests/channels/pjsip/subscriptions/presence/resubscribe/configs/ast1/modules.conf.inc
@@ -0,0 +1 @@
+noload => res_pjsip_xpidf_body_generator.so
diff --git a/tests/channels/pjsip/subscriptions/presence/unsubscribe/configs/ast1/modules.conf b/tests/channels/pjsip/subscriptions/presence/unsubscribe/configs/ast1/modules.conf
deleted file mode 100644
index 0aaf4bf..0000000
--- a/tests/channels/pjsip/subscriptions/presence/unsubscribe/configs/ast1/modules.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-[modules]
-autoload=yes
-
-noload => chan_alsa.so
-noload => chan_oss.so
-noload => chan_console.so
-noload => chan_sip.so
-
-noload => res_pjsip_xpidf_body_generator.so
diff --git a/tests/channels/pjsip/subscriptions/presence/unsubscribe/configs/ast1/modules.conf.inc b/tests/channels/pjsip/subscriptions/presence/unsubscribe/configs/ast1/modules.conf.inc
new file mode 100644
index 0000000..df4b88d
--- /dev/null
+++ b/tests/channels/pjsip/subscriptions/presence/unsubscribe/configs/ast1/modules.conf.inc
@@ -0,0 +1 @@
+noload => res_pjsip_xpidf_body_generator.so
diff --git a/tests/realtime/static/configs/ast1/modules.conf b/tests/realtime/static/configs/ast1/modules.conf
deleted file mode 100644
index 93be420..0000000
--- a/tests/realtime/static/configs/ast1/modules.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-[modules]
-autoload=yes
-
-preload => res_config_curl.so
-
-noload => chan_alsa.so
-noload => chan_oss.so
-noload => chan_console.so
-
diff --git a/tests/realtime/static/configs/ast1/modules.conf.inc b/tests/realtime/static/configs/ast1/modules.conf.inc
new file mode 100644
index 0000000..8927851
--- /dev/null
+++ b/tests/realtime/static/configs/ast1/modules.conf.inc
@@ -0,0 +1 @@
+preload => res_config_curl.so

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6cf431d0ea110293f766c1e070050914d75b6611
Gerrit-PatchSet: 2
Gerrit-Project: testsuite
Gerrit-Branch: master
Gerrit-Owner: Corey Farrell <git at cfware.com>
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Matt Jordan <mjordan at digium.com>

