From: Alan T. DeKok Date: Sun, 8 Oct 2023 12:03:57 +0000 (-0400) Subject: get rid of backticks in tests X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e0169e97f0b7178c541a7493e94d483ac178a60f;p=thirdparty%2Ffreeradius-server.git get rid of backticks in tests --- diff --git a/src/tests/unit/condition/base.txt b/src/tests/unit/condition/base.txt index 5a5fafc2b6..87795d25ac 100644 --- a/src/tests/unit/condition/base.txt +++ b/src/tests/unit/condition/base.txt @@ -202,9 +202,6 @@ match (&Framed-IP-Address <= 192.168.0.0/16) condition &User-Name == "bob" match (&User-Name == "bob") -condition &User-Name == `bob` -match (&User-Name == `bob`) - condition &User-Name == 'bob' match (&User-Name == 'bob') @@ -406,9 +403,6 @@ match %{rcode:'fail'} condition ("a") match "a" -condition (`a`) -match `a` - condition (&User-Name) match &User-Name @@ -680,4 +674,4 @@ condition (&User-Name == "bob") && ((&User-Password == "bob") || &EAP-Message) match ((&User-Name == "bob") && ((&User-Password == "bob") || &EAP-Message)) count -match 307 +match 303 diff --git a/src/tests/unit/xlat/cond_base.txt b/src/tests/unit/xlat/cond_base.txt index 2a24899e86..df99fbcee3 100644 --- a/src/tests/unit/xlat/cond_base.txt +++ b/src/tests/unit/xlat/cond_base.txt @@ -200,9 +200,6 @@ match (&Framed-IP-Address <= 192.168.0.0/16) xlat_purify &User-Name == "bob" match (&User-Name == "bob") -xlat_purify &User-Name == `bob` -match (&User-Name == `bob`) - xlat_purify &User-Name == 'bob' match (&User-Name == 'bob') @@ -408,9 +405,6 @@ match 'a' xlat_purify ("a") match "a" -xlat_purify (`a`) -match `a` - xlat_purify (&User-Name) match &User-Name @@ -767,4 +761,4 @@ xlat_purify (192.168.0.1 !== 192.168.0.2) match true count -match 328 +match 324 diff --git a/src/tests/unit/xlat/purify.txt b/src/tests/unit/xlat/purify.txt index e98ec192a1..63d4f0e410 100644 --- a/src/tests/unit/xlat/purify.txt +++ b/src/tests/unit/xlat/purify.txt @@ -67,8 +67,8 @@ match true xlat_purify &Service-Type == Framed-User match (&Service-Type == Framed-User) -#xlat_purify 1 + (&Service-Type == Framed-User) -#match (1 + (&Service-Type == Framed-User)) +xlat_purify 1 + (&Service-Type == Framed-User) +match (1 + (&Service-Type == Framed-User)) # # Strings of various forms @@ -259,4 +259,4 @@ xlat_purify %md5("foo") match 0xacbd18db4cc2f85cedef654fccc4a4d8 count -match 114 +match 116 diff --git a/src/tests/xlat/expr.txt b/src/tests/xlat/expr.txt index 0ae53f4985..03527e2b6f 100644 --- a/src/tests/xlat/expr.txt +++ b/src/tests/xlat/expr.txt @@ -71,21 +71,6 @@ xlat_expr 00:01:02:03:04:05 ^ 11:22:33:44:55:66 match NULL #match ERROR expanding xlat: Cannot perform any operations for destination type ether -# -# Execute external programs. -# -xlat_expr `/bin/echo foo %n` -match foo 0 - -# -# Linux has /bin/false, and /usr/bin/test -# OSX has /usr/bin/false, and /bin/test -# -# However, they both have /bin/rm ! -# -xlat_expr `/bin/rm this_file_should_not_exist_if_it_does_too_bad_for_you` -match ERROR expanding xlat: Program failed with status 1 - # # NAS-IP-Address doesn't exist. #