[SR-Dev] git:master: refine registrar tests, bug #2790184, port from kamailio r5837

[Henning Westerholt]

Module: sip-router
Branch: master
Commit: db9c2d1d90db2e031692c6645aef5ac8aa916ddb
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=db9c2d1d90db2e031692c6645aef5ac8aa916ddb

Author: Henning Westerholt <henning.westerholt at 1und1.de>
Committer: Henning Westerholt <henning.westerholt at 1und1.de>
Date:   Wed May 13 15:25:52 2009 +0200

refine registrar tests, bug #2790184, port from kamailio r5837

---

 test/unit/11.cfg |    6 ------
 test/unit/19.cfg |    7 +++++++
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/test/unit/11.cfg b/test/unit/11.cfg
index 314bccb..70a9cfa 100644
--- a/test/unit/11.cfg
+++ b/test/unit/11.cfg
@@ -21,7 +21,6 @@ loadmodule "usrloc"
 modparam("usrloc", "db_mode", 1)
 
 loadmodule "registrar"
-modparam("registrar", "reg_callid_avp", "$avp(s:foobar)")
 modparam("registrar", "min_expires", 5)
 modparam("usrloc", "timer_interval", 2)
 
@@ -61,11 +60,6 @@ route{
 			sl_send_reply("404", "Not Found");
 			exit;
 		}
-		$avp(s:foobar) = $ci + "bar";
-#		$avp(s:foobar) = $ci;
-		if (registered("location")) {
-			xlog("already registered");
-		}
 		append_hf("P-hint: usrloc applied\r\n");
 	}
 
diff --git a/test/unit/19.cfg b/test/unit/19.cfg
index 8f5586c..0bfa64a 100644
--- a/test/unit/19.cfg
+++ b/test/unit/19.cfg
@@ -17,8 +17,10 @@ loadmodule "registrar/registrar.so"
 loadmodule "sl/sl.so"
 loadmodule "tm/tm.so"
 loadmodule "maxfwd/maxfwd.so"
+loadmodule "pv/pv.so"
 #for debugging purposes only
 loadmodule "mi_fifo/mi_fifo.so"
+loadmodule "xlog/xlog.so"
 
 
 #-----------------------Module parameters-------------------------------------
@@ -33,6 +35,11 @@ route{
 		exit();
 	}
 
+	if (registered("location")) {
+		xlog("contact registered");
+	}
+
+
 	if(!lookup ("location")){
 		sl_send_reply("404", "Not Found");
 	}