[asterisk-commits] rest api modules tests: Fix modules.conf customizations. (testsuite[master])

[SVN commits to the Asterisk project]

Anonymous Coward #1000019 has submitted this change and it was merged.

Change subject: rest_api modules tests: Fix modules.conf customizations.
......................................................................


rest_api modules tests: Fix modules.conf customizations.

modules.conf should only be provided by tests when disabling autoload.
All tests with autoload enabled should use modules.conf.inc to provide
additional settings.  This change fixes the rest_api modules tests to
ensure the defaults from the global modules.conf still apply.

Change-Id: I87681ff03875bce1495331a52961179cc7d517b0
---
R tests/rest_api/asterisk/modules/load_already_loaded_module/configs/ast1/modules.conf.inc
D tests/rest_api/asterisk/modules/load_module/configs/ast1/modules.conf
A tests/rest_api/asterisk/modules/load_module/configs/ast1/modules.conf.inc
D tests/rest_api/asterisk/modules/reload_module/configs/ast1/modules.conf
A tests/rest_api/asterisk/modules/reload_module/configs/ast1/modules.conf.inc
D tests/rest_api/asterisk/modules/reload_unloaded_module/configs/ast1/modules.conf
A tests/rest_api/asterisk/modules/reload_unloaded_module/configs/ast1/modules.conf.inc
D tests/rest_api/asterisk/modules/unload_module/configs/ast1/modules.conf
A tests/rest_api/asterisk/modules/unload_module/configs/ast1/modules.conf.inc
9 files changed, 4 insertions(+), 25 deletions(-)

Approvals:
  Anonymous Coward #1000019: Verified
  Joshua Colp: Looks good to me, approved
  George Joseph: Looks good to me, but someone else must approve



diff --git a/tests/rest_api/asterisk/modules/load_already_loaded_module/configs/ast1/modules.conf b/tests/rest_api/asterisk/modules/load_already_loaded_module/configs/ast1/modules.conf.inc
similarity index 65%
rename from tests/rest_api/asterisk/modules/load_already_loaded_module/configs/ast1/modules.conf
rename to tests/rest_api/asterisk/modules/load_already_loaded_module/configs/ast1/modules.conf.inc
index 8be9f4b..0b06dd5 100644
--- a/tests/rest_api/asterisk/modules/load_already_loaded_module/configs/ast1/modules.conf
+++ b/tests/rest_api/asterisk/modules/load_already_loaded_module/configs/ast1/modules.conf.inc
@@ -1,7 +1,2 @@
-[modules]
-
-autoload=yes
-
 load => app_playback.so
 noload => res_parking.so
-
diff --git a/tests/rest_api/asterisk/modules/load_module/configs/ast1/modules.conf b/tests/rest_api/asterisk/modules/load_module/configs/ast1/modules.conf
deleted file mode 100644
index fa43cdb..0000000
--- a/tests/rest_api/asterisk/modules/load_module/configs/ast1/modules.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-[modules]
-
-autoload=yes
-
-noload => app_playback.so
diff --git a/tests/rest_api/asterisk/modules/load_module/configs/ast1/modules.conf.inc b/tests/rest_api/asterisk/modules/load_module/configs/ast1/modules.conf.inc
new file mode 100644
index 0000000..a5a603f
--- /dev/null
+++ b/tests/rest_api/asterisk/modules/load_module/configs/ast1/modules.conf.inc
@@ -0,0 +1 @@
+noload => app_playback.so
diff --git a/tests/rest_api/asterisk/modules/reload_module/configs/ast1/modules.conf b/tests/rest_api/asterisk/modules/reload_module/configs/ast1/modules.conf
deleted file mode 100644
index def8cfe..0000000
--- a/tests/rest_api/asterisk/modules/reload_module/configs/ast1/modules.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-[modules]
-
-autoload=yes
-
-load => app_playback.so
diff --git a/tests/rest_api/asterisk/modules/reload_module/configs/ast1/modules.conf.inc b/tests/rest_api/asterisk/modules/reload_module/configs/ast1/modules.conf.inc
new file mode 100644
index 0000000..502879c
--- /dev/null
+++ b/tests/rest_api/asterisk/modules/reload_module/configs/ast1/modules.conf.inc
@@ -0,0 +1 @@
+load => app_playback.so
diff --git a/tests/rest_api/asterisk/modules/reload_unloaded_module/configs/ast1/modules.conf b/tests/rest_api/asterisk/modules/reload_unloaded_module/configs/ast1/modules.conf
deleted file mode 100644
index fa43cdb..0000000
--- a/tests/rest_api/asterisk/modules/reload_unloaded_module/configs/ast1/modules.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-[modules]
-
-autoload=yes
-
-noload => app_playback.so
diff --git a/tests/rest_api/asterisk/modules/reload_unloaded_module/configs/ast1/modules.conf.inc b/tests/rest_api/asterisk/modules/reload_unloaded_module/configs/ast1/modules.conf.inc
new file mode 100644
index 0000000..a5a603f
--- /dev/null
+++ b/tests/rest_api/asterisk/modules/reload_unloaded_module/configs/ast1/modules.conf.inc
@@ -0,0 +1 @@
+noload => app_playback.so
diff --git a/tests/rest_api/asterisk/modules/unload_module/configs/ast1/modules.conf b/tests/rest_api/asterisk/modules/unload_module/configs/ast1/modules.conf
deleted file mode 100644
index e5af2ee..0000000
--- a/tests/rest_api/asterisk/modules/unload_module/configs/ast1/modules.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-[modules]
-
-autoload=yes
-
-load=app_confbridge.so
diff --git a/tests/rest_api/asterisk/modules/unload_module/configs/ast1/modules.conf.inc b/tests/rest_api/asterisk/modules/unload_module/configs/ast1/modules.conf.inc
new file mode 100644
index 0000000..74440b6
--- /dev/null
+++ b/tests/rest_api/asterisk/modules/unload_module/configs/ast1/modules.conf.inc
@@ -0,0 +1 @@
+load=app_confbridge.so

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I87681ff03875bce1495331a52961179cc7d517b0
Gerrit-PatchSet: 1
Gerrit-Project: testsuite
Gerrit-Branch: master
Gerrit-Owner: Corey Farrell <git at cfware.com>
Gerrit-Reviewer: Anonymous Coward #1000019
Gerrit-Reviewer: George Joseph <george.joseph at fairview5.com>
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>