[asterisk-commits] sys.path.append: Clean up extraneous appends of lib/python/... (testsuite[master])

[SVN commits to the Asterisk project]

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

Change subject: sys.path.append:  Clean up extraneous appends of lib/python/asterisk
......................................................................


sys.path.append:  Clean up extraneous appends of lib/python/asterisk

Specifically importing 'lib/python/asterisk' was causing a few tests
to fail since ./runtests.py was updated to automatically append it.

Change-Id: I392a57073818fbb034013f38b212a1422a2d2f48
---
M tests/apps/mixmonitor/run-test
M tests/apps/mixmonitor_rxtx/run-test
M tests/channels/SIP/sip_attended_transfer/attended_transfer.py
M tests/channels/SIP/tcpauthlimit/tcpauthlimit.py
M tests/hep/hep_capture_node.py
M tests/rest_api/danger/safe/safe.py
M tests/rest_api/external_interaction/attended_transfer/attended_transfer.py
M tests/rest_api/external_interaction/blind_transfer/call_transfer.py
M tests/rest_api/message/message_modules.py
9 files changed, 2 insertions(+), 16 deletions(-)

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



diff --git a/tests/apps/mixmonitor/run-test b/tests/apps/mixmonitor/run-test
index 816ee3a..784bd9b 100755
--- a/tests/apps/mixmonitor/run-test
+++ b/tests/apps/mixmonitor/run-test
@@ -16,8 +16,7 @@
 
 from twisted.internet import reactor
 
-sys.path.append("lib/python/asterisk")
-from test_case import TestCase
+from asterisk.test_case import TestCase
 
 testdir = "tests/apps/mixmonitor"
 
diff --git a/tests/apps/mixmonitor_rxtx/run-test b/tests/apps/mixmonitor_rxtx/run-test
index 3522a32..a654839 100755
--- a/tests/apps/mixmonitor_rxtx/run-test
+++ b/tests/apps/mixmonitor_rxtx/run-test
@@ -16,8 +16,7 @@
 
 from twisted.internet import reactor
 
-sys.path.append("lib/python/asterisk")
-from test_case import TestCase
+from asterisk.test_case import TestCase
 
 testdir = "tests/apps/mixmonitor"
 
diff --git a/tests/channels/SIP/sip_attended_transfer/attended_transfer.py b/tests/channels/SIP/sip_attended_transfer/attended_transfer.py
index ddf8736..1915f8e 100644
--- a/tests/channels/SIP/sip_attended_transfer/attended_transfer.py
+++ b/tests/channels/SIP/sip_attended_transfer/attended_transfer.py
@@ -10,8 +10,6 @@
 import pjsua as pj
 import sys
 
-sys.path.append('lib/python/asterisk')
-
 from version import AsteriskVersion
 from twisted.internet import reactor
 
diff --git a/tests/channels/SIP/tcpauthlimit/tcpauthlimit.py b/tests/channels/SIP/tcpauthlimit/tcpauthlimit.py
index 644bf9e..b21fa0f 100755
--- a/tests/channels/SIP/tcpauthlimit/tcpauthlimit.py
+++ b/tests/channels/SIP/tcpauthlimit/tcpauthlimit.py
@@ -10,8 +10,6 @@
 import sys
 import logging
 
-sys.path.append("lib/python/asterisk")
-
 from sipp_scenario import SIPpScenarioWrapper
 from twisted.internet import defer
 
diff --git a/tests/hep/hep_capture_node.py b/tests/hep/hep_capture_node.py
index 1412b35..8170213 100644
--- a/tests/hep/hep_capture_node.py
+++ b/tests/hep/hep_capture_node.py
@@ -25,8 +25,6 @@
 
 LOGGER = logging.getLogger(__name__)
 
-sys.path.append('lib/python/asterisk')
-
 from test_suite_utils import all_match
 
 def enum(**enums):
diff --git a/tests/rest_api/danger/safe/safe.py b/tests/rest_api/danger/safe/safe.py
index 18ee899..ef21d89 100644
--- a/tests/rest_api/danger/safe/safe.py
+++ b/tests/rest_api/danger/safe/safe.py
@@ -11,8 +11,6 @@
 
 LOGGER = logging.getLogger(__name__)
 
-sys.path.append('lib/python/asterisk')
-
 from version import AsteriskVersion
 
 
diff --git a/tests/rest_api/external_interaction/attended_transfer/attended_transfer.py b/tests/rest_api/external_interaction/attended_transfer/attended_transfer.py
index 422ed74..d03fbfe 100755
--- a/tests/rest_api/external_interaction/attended_transfer/attended_transfer.py
+++ b/tests/rest_api/external_interaction/attended_transfer/attended_transfer.py
@@ -9,7 +9,6 @@
 import logging
 from sys import path
 
-path.append("lib/python/asterisk")
 from sipp import SIPpScenario
 
 LOGGER = logging.getLogger(__name__)
diff --git a/tests/rest_api/external_interaction/blind_transfer/call_transfer.py b/tests/rest_api/external_interaction/blind_transfer/call_transfer.py
index b853103..23f1a7b 100755
--- a/tests/rest_api/external_interaction/blind_transfer/call_transfer.py
+++ b/tests/rest_api/external_interaction/blind_transfer/call_transfer.py
@@ -16,7 +16,6 @@
 import pjsua as pj
 from twisted.internet import reactor
 
-sys.path.append("lib/python/asterisk")
 import pjsua_mod
 
 LOGGER = logging.getLogger(__name__)
diff --git a/tests/rest_api/message/message_modules.py b/tests/rest_api/message/message_modules.py
index 7bf98b1..2e4cdd4 100644
--- a/tests/rest_api/message/message_modules.py
+++ b/tests/rest_api/message/message_modules.py
@@ -14,8 +14,6 @@
 
 from twisted.internet import defer
 
-sys.path.append('lib/python/asterisk')
-
 from sipp import SIPpScenario
 
 LOGGER = logging.getLogger(__name__)

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I392a57073818fbb034013f38b212a1422a2d2f48
Gerrit-PatchSet: 2
Gerrit-Project: testsuite
Gerrit-Branch: master
Gerrit-Owner: George Joseph <george.joseph at fairview5.com>
Gerrit-Reviewer: Anonymous Coward #1000019
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Kevin Harwell <kharwell at digium.com>