From: Arran Cudbard-Bell Date: Tue, 10 Sep 2019 14:26:47 +0000 (-0500) Subject: Set dependencies correctly for return keyword tests X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4db03162a068888bb48bd35c01fee889bd19dd2e;p=thirdparty%2Ffreeradius-server.git Set dependencies correctly for return keyword tests --- diff --git a/src/tests/keywords/return-break-mix b/src/tests/keywords/return-break-mix index 077999ebd5d..cfb47168c8c 100644 --- a/src/tests/keywords/return-break-mix +++ b/src/tests/keywords/return-break-mix @@ -1,3 +1,6 @@ +# +# PRE: update if return foreach +# update control { &Tmp-Integer-0 += 0 &Tmp-Integer-0 += 1 diff --git a/src/tests/keywords/return-group b/src/tests/keywords/return-group index e65c49db9a6..541eb62abb2 100644 --- a/src/tests/keywords/return-group +++ b/src/tests/keywords/return-group @@ -1,4 +1,5 @@ -# PRE: return +# +# PRE: update if return # update { &control:Auth-Type = 'Accept' diff --git a/src/tests/keywords/return-section b/src/tests/keywords/return-section index 4b3ef0b8db7..5a9b0d34070 100644 --- a/src/tests/keywords/return-section +++ b/src/tests/keywords/return-section @@ -1,5 +1,5 @@ # -# PRE: update if +# PRE: update if return # update control { &Cleartext-Password := 'hello' diff --git a/src/tests/keywords/return-within-condition-dynamic b/src/tests/keywords/return-within-condition-dynamic index bf89755485f..eda067742ff 100644 --- a/src/tests/keywords/return-within-condition-dynamic +++ b/src/tests/keywords/return-within-condition-dynamic @@ -1,3 +1,6 @@ +# +# PRE: update if +# if (&User-Name == 'bob') { success return diff --git a/src/tests/keywords/return-within-condition-static b/src/tests/keywords/return-within-condition-static index ea7b583eb60..3cbf90303b3 100644 --- a/src/tests/keywords/return-within-condition-static +++ b/src/tests/keywords/return-within-condition-static @@ -1,3 +1,6 @@ +# +# PRE: update if return +# if ("no" == no) { success return diff --git a/src/tests/keywords/return-within-foreach b/src/tests/keywords/return-within-foreach index c7129089f18..dae399c6695 100644 --- a/src/tests/keywords/return-within-foreach +++ b/src/tests/keywords/return-within-foreach @@ -1,3 +1,6 @@ +# +# PRE: update if return foreach +# update control { &Tmp-Integer-0 += 0 &Tmp-Integer-0 += 1 diff --git a/src/tests/keywords/return-within-policy b/src/tests/keywords/return-within-policy index 60254cd18fc..d3d04cffc5e 100644 --- a/src/tests/keywords/return-within-policy +++ b/src/tests/keywords/return-within-policy @@ -1,3 +1,6 @@ +# +# PRE: update if return +# group { # Return must stop after the policy, otherwise we don't setup the test for success policy_return