SIP reg+unreg smoke test; use vars.SIP_SERVER/USER/PASSWORD (repo variables)

Author: sthorat789

.github/workflows/build.yml

@@ -221,17 +221,15 @@ jobs:
         shell: bash
         env:
           EXPECTED_VERSION: ${{ steps.version.outputs.package_version }}
-          SIP_REGISTRAR: ${{ secrets.SIP_REGISTRAR }}
-          SIP_USER: ${{ secrets.SIP_USER }}
-          SIP_PASSWORD: ${{ secrets.SIP_PASSWORD }}
-          SIP_DOMAIN: ${{ secrets.SIP_DOMAIN }}
+          SIP_REGISTRAR: ${{ vars.SIP_SERVER }}
+          SIP_USER: ${{ vars.SIP_USER }}
+          SIP_PASSWORD: ${{ vars.SIP_PASSWORD }}
         run: |
           python scripts/smoke_test.py \
             --expected-version "$EXPECTED_VERSION" \
             ${SIP_REGISTRAR:+--sip-registrar "$SIP_REGISTRAR"} \
             ${SIP_USER:+--sip-user "$SIP_USER"} \
-            ${SIP_PASSWORD:+--sip-password "$SIP_PASSWORD"} \
-            ${SIP_DOMAIN:+--sip-domain "$SIP_DOMAIN"}
+            ${SIP_PASSWORD:+--sip-password "$SIP_PASSWORD"}
 
   github-release:
     if: startsWith(github.ref, 'refs/tags/v')

scripts/smoke_test.py

@@ -112,20 +112,35 @@ def check_endpoint_lifecycle():
     ep.libDestroy()
 
 
-def check_sip_registration(registrar: str, user: str, password: str,
-                            domain: str, timeout: int = 20):
+def check_sip_register_unregister(registrar: str, user: str, password: str,
+                                   domain: str, timeout: int = 30):
+    """Register then explicitly unregister, verifying both callbacks fire."""
     import pjsua2
 
-    result: dict = {"ok": False, "code": None, "reason": ""}
-    done = threading.Event()
+    reg_result: dict   = {"ok": False, "code": None, "reason": ""}
+    unreg_result: dict = {"ok": False, "code": None, "reason": ""}
+    reg_done   = threading.Event()
+    unreg_done = threading.Event()
 
     class _Account(pjsua2.Account):
         def onRegState(self, prm):
-            result["code"] = prm.code
-            result["reason"] = prm.reason
-            if prm.code // 100 == 2:
-                result["ok"] = True
-            done.set()
+            code = prm.code
+            reason = prm.reason
+            expiry = prm.expiration
+            if not reg_done.is_set():
+                # First callback → registration response
+                reg_result["code"]   = code
+                reg_result["reason"] = reason
+                if code // 100 == 2 and expiry > 0:
+                    reg_result["ok"] = True
+                reg_done.set()
+            else:
+                # Second callback → unregistration response (expiry == 0)
+                unreg_result["code"]   = code
+                unreg_result["reason"] = reason
+                if code // 100 == 2 and expiry == 0:
+                    unreg_result["ok"] = True
+                unreg_done.set()
 
     ep = pjsua2.Endpoint()
     cfg = pjsua2.EpConfig()
@@ -147,17 +162,36 @@ def onRegState(self, prm):
     acc_cfg.sipConfig.authCreds.append(cred)
     acc.create(acc_cfg)
 
-    fired = done.wait(timeout=timeout)
-    acc.delete()
-    ep.libDestroy()
-
-    if not fired:
+    # --- Wait for REGISTER 200 OK ---
+    if not reg_done.wait(timeout=timeout):
+        acc.delete()
+        ep.libDestroy()
         raise AssertionError(
             f"SIP registration timed out after {timeout}s (no response from {registrar})"
         )
-    if not result["ok"]:
+    if not reg_result["ok"]:
+        acc.delete()
+        ep.libDestroy()
+        raise AssertionError(
+            f"SIP registration failed: {reg_result['code']} {reg_result['reason']}"
+        )
+
+    # --- Send REGISTER with Expires: 0 (unregister) ---
+    acc.setRegistration(False)
+
+    if not unreg_done.wait(timeout=timeout):
+        acc.delete()
+        ep.libDestroy()
+        raise AssertionError(
+            f"SIP unregistration timed out after {timeout}s"
+        )
+
+    acc.delete()
+    ep.libDestroy()
+
+    if not unreg_result["ok"]:
         raise AssertionError(
-            f"SIP registration failed: {result['code']} {result['reason']}"
+            f"SIP unregistration failed: {unreg_result['code']} {unreg_result['reason']}"
         )
 
 
@@ -211,18 +245,19 @@ def run(label: str, fn):
     run("module attributes", lambda: f"{check_modules(pjsua2_mod)} attrs")
     run("endpoint lifecycle", check_endpoint_lifecycle)
 
-    sip_creds = (args.sip_registrar, args.sip_user,
-                 args.sip_password, args.sip_domain)
+    # Domain defaults to registrar host when not specified separately
+    sip_domain = args.sip_domain or args.sip_registrar
+    sip_creds = (args.sip_registrar, args.sip_user, args.sip_password, sip_domain)
     if all(sip_creds):
         run(
-            f"SIP registration ({args.sip_user}@{args.sip_domain})",
-            lambda: check_sip_registration(
+            f"SIP register+unregister ({args.sip_user}@{sip_domain})",
+            lambda: check_sip_register_unregister(
                 args.sip_registrar, args.sip_user,
-                args.sip_password, args.sip_domain,
+                args.sip_password, sip_domain,
             ),
         )
     else:
-        print("  SIP registration ... SKIP (set SIP_* secrets to enable)")
+        print("  SIP register+unregister ... SKIP (set SIP_* vars to enable)")
 
     print("=" * 60)
     print(f"Results: {passed} passed, {failed} failed")