[Asterisk-code-review] tetssuite: Fix pjsip/qualify/basic test breakage (testsuite[master])

[Joshua Colp]

Joshua Colp has submitted this change and it was merged.

Change subject: tetssuite:  Fix pjsip/qualify/basic test breakage
......................................................................


tetssuite:  Fix pjsip/qualify/basic test breakage

There appeared to be a race condition in the test during the
initial qualify that could be triggered by the timers and
how fast/slow asterisk starts.  I've changed the test to
ignore any Unreachable events that may be sent and only look
for the Reachable ones.

Change-Id: Iba6962deb113cea9aae6951f594fe16b7dbbbae7
---
M tests/channels/pjsip/qualify/basic/configs/ast1/pjsip.conf
M tests/channels/pjsip/qualify/basic/test-config.yaml
2 files changed, 5 insertions(+), 4 deletions(-)

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



diff --git a/tests/channels/pjsip/qualify/basic/configs/ast1/pjsip.conf b/tests/channels/pjsip/qualify/basic/configs/ast1/pjsip.conf
index f9e3f8d..87b9be6 100644
--- a/tests/channels/pjsip/qualify/basic/configs/ast1/pjsip.conf
+++ b/tests/channels/pjsip/qualify/basic/configs/ast1/pjsip.conf
@@ -11,4 +11,5 @@
 [sipp]
 type=aor
 contact=sip:127.0.0.1:5061
+qualify_timeout=10
 qualify_frequency=5
diff --git a/tests/channels/pjsip/qualify/basic/test-config.yaml b/tests/channels/pjsip/qualify/basic/test-config.yaml
index ff7c5e1..29d165e 100644
--- a/tests/channels/pjsip/qualify/basic/test-config.yaml
+++ b/tests/channels/pjsip/qualify/basic/test-config.yaml
@@ -28,11 +28,11 @@
         conditions:
             match:
                 Event: 'TestEvent'
-                State: 'AOR_CONTACT_UPDATE'
+                State: 'AOR_CONTACT_QUALIFY_RESULT'
+                Status: 'Reachable'
         requirements:
             match:
                 Contact: 'sipp@@sip:127.0.0.1:5061'
-                Status: 'Reachable'
         count: '1'
     -
         type: 'headermatch'
@@ -40,11 +40,11 @@
         conditions:
             match:
                 Event: 'TestEvent'
-                State: 'AOR_CONTACT_QUALIFY_RESULT'
+                State: 'AOR_CONTACT_UPDATE'
+                Status: 'Reachable'
         requirements:
             match:
                 Contact: 'sipp@@sip:127.0.0.1:5061'
-                Status: 'Reachable'
         count: '1'
 
 properties:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iba6962deb113cea9aae6951f594fe16b7dbbbae7
Gerrit-PatchSet: 1
Gerrit-Project: testsuite
Gerrit-Branch: master
Gerrit-Owner: George Joseph <george.joseph at fairview5.com>
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Mark Michelson <mmichelson at digium.com>