[asterisk-commits] Remove references to non-existent code. (testsuite[master])

[SVN commits to the Asterisk project]

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

Change subject: Remove references to non-existent code.
......................................................................


Remove references to non-existent code.

The tcpauthlimit TCP client scenario fix removed some dead code.
However, there was still some code referencing that dead code that did
not get removed. These references to now non-existent code caused the
SIPp client scenario to start failing.

This commit removes the references to removed code so that the SIPp
client scenario now passes properly again.

Change-Id: I78b6c065bbd7c13635e82eb3a74785d176628dd5
---
M tests/channels/SIP/tcpauthlimit/tcpauthlimit.py
1 file changed, 2 insertions(+), 18 deletions(-)

Approvals:
  Anonymous Coward #1000019: Verified
  Joshua Colp: Looks good to me, approved



diff --git a/tests/channels/SIP/tcpauthlimit/tcpauthlimit.py b/tests/channels/SIP/tcpauthlimit/tcpauthlimit.py
index 7241554..644bf9e 100755
--- a/tests/channels/SIP/tcpauthlimit/tcpauthlimit.py
+++ b/tests/channels/SIP/tcpauthlimit/tcpauthlimit.py
@@ -12,7 +12,6 @@
 
 sys.path.append("lib/python/asterisk")
 
-from tcp_scenario import TcpClientScenario
 from sipp_scenario import SIPpScenarioWrapper
 from twisted.internet import defer
 
@@ -28,9 +27,6 @@
 
     if scenario_type == 'SIPpScenarioWrapper':
         return 'SIPp scenario'
-
-    if scenario_type == 'TcpClientScenario':
-        return 'TCP client scenario'
 
     return 'Unknown type scenario'
 
@@ -82,12 +78,7 @@
             scenario_type = config_scenario['type']
             scenario_id = config_scenario.get('scenario-id') or None
 
-            if scenario_type.lower() == 'tcp-client':
-                scenario = TcpClientScenario(scenario_id,
-                                             remote_address,
-                                             remote_port,
-                                             tcpauthlimit)
-            elif scenario_type.lower() == 'sipp-scenario':
+            if scenario_type.lower() == 'sipp-scenario':
                 key_args = config_scenario['key-args']
                 ordered_args = config_scenario.get('ordered-args') or []
                 target = config_scenario.get('target') or remote_address
@@ -118,10 +109,6 @@
         the tcpauthlimit (maximum number of connections permitted). Because
         more scenarios are executed than the number of connections permitted,
         some of these scenarios are expected to fail.
-
-        For TcpClientScenario scenario type evaluations, the scenarios are
-        polled for their default pass/fail status without any adjustments being
-        applied.
 
         Keyword Arguments:
         scenario_type          -- The type of scenario instances to analyze.
@@ -206,10 +193,7 @@
 
         LOGGER.debug('{0} Evaluating test results...'.format(self))
 
-        if not self.__evaluate_scenario_results('SIPpScenarioWrapper'):
-            return False
-
-        return self.__evaluate_scenario_results('TcpClientScenario')
+        return self.__evaluate_scenario_results('SIPpScenarioWrapper')
 
     def __format__(self, format_spec):
         """Overrides default format handling for 'self'."""

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I78b6c065bbd7c13635e82eb3a74785d176628dd5
Gerrit-PatchSet: 1
Gerrit-Project: testsuite
Gerrit-Branch: master
Gerrit-Owner: Mark Michelson <mmichelson at digium.com>
Gerrit-Reviewer: Anonymous Coward #1000019
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>