Просмотр исходного кода

- extend test with flag support

git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4012 689a6050-402a-0410-94f2-e92a70836424
Henning Westerholt 17 лет назад
Родитель
Сommit
67e373c21d
2 измененных файлов с 19 добавлено и 12 удалено
  1. 3 0
      test/unit/26.cfg
  2. 16 12
      test/unit/26.sh

+ 3 - 0
test/unit/26.cfg

@@ -23,6 +23,9 @@ route{
 		sl_send_reply("513", "Message too big");
 		return;
 	}
+	# set flag for later test
+	setflag(0);
+
 	# user route
 	if(cr_user_carrier("$rU", "$rd", "$avp(carrier)")) {
 		$avp(domain)="0";

+ 16 - 12
test/unit/26.sh

@@ -39,18 +39,22 @@ $MYSQL "insert into route_tree (id, carrier) values ('1', 'default');"
 $MYSQL "insert into route_tree (id, carrier) values ('2', 'carrier1');"
 $MYSQL "insert into route_tree (id, carrier) values ('3', 'carrier2');"
 
-$MYSQL "insert into carrierroute (id, carrier, domain, scan_prefix, prob, strip, rewrite_host)
-values ('1','1','0','49','0.5','0','127.0.0.1:7000');"
-$MYSQL "insert into carrierroute (id, carrier, domain, scan_prefix, prob, strip, rewrite_host)
-values ('2','1','0','49','0.5','0','127.0.0.1:8000');"
-$MYSQL "insert into carrierroute (id, carrier, domain, scan_prefix, prob, strip, rewrite_host)
-values ('3','2','0','49','1','0','127.0.0.1:9000');"
-$MYSQL "insert into carrierroute (id, carrier, domain, scan_prefix, prob, strip, rewrite_host)
-values ('4','3','0','49','1','0','127.0.0.1:10000');"
-$MYSQL "insert into carrierroute (id, carrier, domain, scan_prefix, prob, strip, rewrite_host)
-values ('5','3','fallback','49','1','0','127.0.0.1:10000');"
-$MYSQL "insert into carrierroute (id, carrier, domain, scan_prefix, prob, strip, rewrite_host)
-values ('6','3','2','49','1','0','127.0.0.1:10000');"
+$MYSQL "insert into carrierroute (id, carrier, domain, scan_prefix, flags, prob, strip, rewrite_host)
+values ('1','1','0','49','0','0.5','0','127.0.0.1:7000');"
+$MYSQL "insert into carrierroute (id, carrier, domain, scan_prefix, flags, prob, strip, rewrite_host)
+values ('2','1','0','49','0','0.5','0','127.0.0.1:8000');"
+$MYSQL "insert into carrierroute (id, carrier, domain, scan_prefix, flags, prob, strip, rewrite_host)
+values ('3','2','0','49','0','1','0','127.0.0.1:9000');"
+$MYSQL "insert into carrierroute (id, carrier, domain, scan_prefix, flags, mask,prob, strip, rewrite_host)
+values ('4','3','0','49','0', '3', '1','0','127.0.0.1:10001');"
+$MYSQL "insert into carrierroute (id, carrier, domain, scan_prefix, flags, mask,prob, strip, rewrite_host)
+values ('5','3','0','49','1', '3', '1','0','127.0.0.1:10000');"
+$MYSQL "insert into carrierroute (id, carrier, domain, scan_prefix, flags, mask, prob, strip, rewrite_host)
+values ('6','3','0','49','2', '3', '1','0','127.0.0.1:10002');"
+$MYSQL "insert into carrierroute (id, carrier, domain, scan_prefix, flags, prob, strip, rewrite_host)
+values ('7','3','fallback','49','0','1','0','127.0.0.1:10000');"
+$MYSQL "insert into carrierroute (id, carrier, domain, scan_prefix, flags, prob, strip, rewrite_host)
+values ('8','3','2','49','0','1','0','127.0.0.1:10000');"
 
 $MYSQL "insert into carrierfailureroute(id, carrier, domain, scan_prefix, host_name, reply_code,
 flags, mask, next_domain) values ('1', '3', '0', '49', '127.0.0.1:10000', '5..', '', '', 'fallback');"