From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Wed, 5 Nov 2014 18:17:22 +0000 (-0500)
Subject: Split apart some integer tests
X-Git-Tag: branch_3_1_x~4769
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=521fffd7a3650ea3b30820158c871ac7b72ee104;p=thirdparty%2Ffreeradius-server.git

Split apart some integer tests
---

diff --git a/src/tests/keywords/integer b/src/tests/keywords/integer
index 32b9c7453d9..7e43270c151 100644
--- a/src/tests/keywords/integer
+++ b/src/tests/keywords/integer
@@ -67,9 +67,15 @@ if ("%{integer:Tmp-String-2}" != '') {
 update request {
 	Tmp-Integer-0 := "%{integer:Tmp-Octets-0}"
 }
-if ((Tmp-Octets-0 != "0x%{hex:Tmp-Integer-0}") || (Tmp-Integer-0 != 959985457)) {
+if (Tmp-Octets-0 != "0x%{hex:Tmp-Integer-0}") {
 	update reply {
-		Filter-Id += 'fail 4'
+		Filter-Id += 'fail 4a'
+	}
+}
+
+if (Tmp-Integer-0 != 959985457) {
+	update reply {
+		Filter-Id += 'fail 4b'
 	}
 }
 
@@ -77,9 +83,15 @@ if ((Tmp-Octets-0 != "0x%{hex:Tmp-Integer-0}") || (Tmp-Integer-0 != 959985457))
 update request {
 	Tmp-Integer64-0 := "%{integer:Tmp-Octets-1}"
 }
-if ((Tmp-Octets-1 != "0x%{hex:Tmp-Integer64-0}") || (Tmp-Integer64-0 != 4123106143410599729)) {
+if (Tmp-Octets-1 != "0x%{hex:Tmp-Integer64-0}") {
+	update reply {
+		Filter-Id += 'fail 5a'
+	}
+}
+
+if (Tmp-Integer64-0 != 4123106143410599729) {
 	update reply {
-		Filter-Id += 'fail 5'
+		Filter-Id += 'fail 5b'
 	}
 }