Define a set of common SQL tests that all driver specific directories links to.

diff --git a/src/tests/modules/README.rst b/src/tests/modules/README.rst
index bcad79b..164509d 100644 (file)
--- a/src/tests/modules/README.rst
+++ b/src/tests/modules/README.rst
@@ -13,3 +13,6 @@ target used to test the module.  The framework automatically makes the
 tests depend on the module (i.e. library).  So if the module source
 changes, you can just do `make MODULE.test`.  The module will be
 re-built, and the tests will be run.
+
+Note: all SQL tests share the same tests definitions (see sql directory).
+The modules themselves simply link to the actual tests files.

diff --git a/src/tests/modules/all.mk b/src/tests/modules/all.mk
index ee5fd2c..9960df7 100644 (file)
--- a/src/tests/modules/all.mk
+++ b/src/tests/modules/all.mk
@@ -34,7 +34,7 @@ $(foreach x,$(TEST_SUBBUILT),$(eval $x.test: rlm_$(subst /,_,$x).la))
 #  For the remaining subdirs, add on the directory to include.
 #  test.mk will run the tests for all modules
 #  It is included last so that the module specific makefiles can be processed first
-#  (modules that require a test server can
+#  (modules that require a test server can set the corresponding require_test_server variable)
 #
 SUBMAKEFILES := $(addsuffix /all.mk,$(TEST_BUILT) $(subst _,/,$(TEST_SUBBUILT))) test.mk
 

diff --git a/src/tests/modules/sql/.gitignore b/src/tests/modules/sql/.gitignore
new file mode 100644 (file)
index 0000000..405551a
--- /dev/null
+++ b/src/tests/modules/sql/.gitignore
@@ -0,0 +1 @@
+rlm_sql_sqlite.db

diff --git a/src/tests/modules/sql/README b/src/tests/modules/sql/README
new file mode 100644 (file)
index 0000000..5458b9b
--- /dev/null
+++ b/src/tests/modules/sql/README
@@ -0,0 +1 @@
+All SQL related tests should be defined here and the driver specific directory need only have links to the tests defined here.

diff --git a/src/tests/modules/sql/acct_0_start.attrs b/src/tests/modules/sql/acct_0_start.attrs
new file mode 100644 (file)
index 0000000..ba5e194
--- /dev/null
+++ b/src/tests/modules/sql/acct_0_start.attrs
@@ -0,0 +1,37 @@
+#
+#  Input packet
+#
+User-Name = 'user@example.org'
+NAS-Port = 17826193
+NAS-IP-Address = 192.0.2.10
+Framed-IP-Address = 198.51.100.59
+NAS-Identifier = 'nas.example.org'
+Acct-Status-Type = Start
+Acct-Delay-Time = 1
+Acct-Input-Octets = 0
+Acct-Output-Octets = 0
+Acct-Session-Id = '00000000'
+Acct-Unique-Session-Id = '00000000'
+Acct-Authentic = RADIUS
+Acct-Session-Time = 0
+Acct-Input-Packets = 0
+Acct-Output-Packets = 0
+Acct-Input-Gigawords = 0
+Acct-Output-Gigawords = 0
+Event-Timestamp = 'Feb  1 2015 08:28:58 WIB'
+NAS-Port-Type = Ethernet
+NAS-Port-Id = 'port 001'
+Service-Type = Framed-User
+Framed-Protocol = PPP
+Acct-Link-Count = 0
+Idle-Timeout = 0
+Session-Timeout = 604800
+Access-Loop-Encapsulation = 0x000000
+Proxy-State = 0x323531
+
+#
+#  Expected answer
+#
+#  There's not an Accounting-Failed packet type in RADIUS...
+#
+Response-Packet-Type == Access-Accept

diff --git a/src/tests/modules/sql/acct_0_start.unlang b/src/tests/modules/sql/acct_0_start.unlang
new file mode 100644 (file)
index 0000000..64921b1
--- /dev/null
+++ b/src/tests/modules/sql/acct_0_start.unlang
@@ -0,0 +1,40 @@
+#
+#  Clear out old data
+#
+update {
+       Tmp-String-0 := "%{sql:DELETE FROM radacct WHERE AcctSessionId = '00000000'}"
+}
+if (!&Tmp-String-0) {
+       test_fail
+}
+else {
+       test_pass
+}
+
+sql.accounting
+if (ok) {
+       test_pass
+}
+else {
+       test_fail
+}
+
+update {
+       Tmp-Integer-0 := "%{sql:SELECT count(*) FROM radacct WHERE AcctSessionId = '00000000'}"
+}
+if (!&Tmp-Integer-0 || (&Tmp-Integer-0 != 1)) {
+       test_fail
+}
+else {
+       test_pass
+}
+
+update {
+       Tmp-Integer-0 := "%{sql:SELECT acctsessiontime FROM radacct WHERE AcctSessionId = '00000000'}"
+}
+if (!&Tmp-Integer-0 || (&Tmp-Integer-0 != 0)) {
+       test_fail
+}
+else {
+       test_pass
+}

diff --git a/src/tests/modules/sql/acct_1_update.attrs b/src/tests/modules/sql/acct_1_update.attrs
new file mode 100644 (file)
index 0000000..33f6ec0
--- /dev/null
+++ b/src/tests/modules/sql/acct_1_update.attrs
@@ -0,0 +1,37 @@
+#
+#  Input packet
+#
+User-Name = 'user@example.org'
+NAS-Port = 17826193
+NAS-IP-Address = 192.0.2.10
+Framed-IP-Address = 198.51.100.59
+NAS-Identifier = 'nas.example.org'
+Acct-Status-Type = Interim-Update
+Acct-Delay-Time = 1
+Acct-Input-Octets = 10
+Acct-Output-Octets = 10
+Acct-Session-Id = '00000000'
+Acct-Unique-Session-Id = '00000000'
+Acct-Authentic = RADIUS
+Acct-Session-Time = 30
+Acct-Input-Packets = 10
+Acct-Output-Packets = 10
+Acct-Input-Gigawords = 1
+Acct-Output-Gigawords = 1
+Event-Timestamp = 'Feb  1 2015 08:28:28 WIB'
+NAS-Port-Type = Ethernet
+NAS-Port-Id = 'port 001'
+Service-Type = Framed-User
+Framed-Protocol = PPP
+Acct-Link-Count = 0
+Idle-Timeout = 0
+Session-Timeout = 604800
+Access-Loop-Encapsulation = 0x000000
+Proxy-State = 0x323531
+
+#
+#  Expected answer
+#
+#  There's not an Accounting-Failed packet type in RADIUS...
+#
+Response-Packet-Type == Access-Accept

diff --git a/src/tests/modules/sql/acct_1_update.unlang b/src/tests/modules/sql/acct_1_update.unlang
new file mode 100644 (file)
index 0000000..a2fa8e4
--- /dev/null
+++ b/src/tests/modules/sql/acct_1_update.unlang
@@ -0,0 +1,30 @@
+#
+#  PRE: acct_0_start
+#
+sql.accounting
+if (ok) {
+       test_pass
+}
+else {
+       test_fail
+}
+
+update {
+       Tmp-Integer-0 := "%{sql:SELECT count(*) FROM radacct WHERE AcctSessionId = '00000000'}"
+}
+if (!&Tmp-Integer-0 || (&Tmp-Integer-0 != 1)) {
+       test_fail
+}
+else {
+       test_pass
+}
+
+update {
+       Tmp-Integer-0 := "%{sql:SELECT acctsessiontime FROM radacct WHERE AcctSessionId = '00000000'}"
+}
+if (!&Tmp-Integer-0 || (&Tmp-Integer-0 != 30)) {
+       test_fail
+}
+else {
+       test_pass
+}

diff --git a/src/tests/modules/sql/acct_2_stop.attrs b/src/tests/modules/sql/acct_2_stop.attrs
new file mode 100644 (file)
index 0000000..d8f9dbc
--- /dev/null
+++ b/src/tests/modules/sql/acct_2_stop.attrs
@@ -0,0 +1,38 @@
+#
+#  Input packet
+#
+User-Name = 'user@example.org'
+NAS-Port = 17826193
+NAS-IP-Address = 192.0.2.10
+Framed-IP-Address = 198.51.100.59
+NAS-Identifier = 'nas.example.org'
+Acct-Status-Type = Stop
+Acct-Terminate-Cause = User-Request
+Acct-Delay-Time = 1
+Acct-Input-Octets = 15
+Acct-Output-Octets = 15
+Acct-Session-Id = '00000000'
+Acct-Unique-Session-Id = '00000000'
+Acct-Authentic = RADIUS
+Acct-Session-Time = 120
+Acct-Input-Packets = 15
+Acct-Output-Packets = 15
+Acct-Input-Gigawords = 1
+Acct-Output-Gigawords = 1
+Event-Timestamp = 'Feb  1 2015 08:28:58 WIB'
+NAS-Port-Type = Ethernet
+NAS-Port-Id = 'port 001'
+Service-Type = Framed-User
+Framed-Protocol = PPP
+Acct-Link-Count = 0
+Idle-Timeout = 0
+Session-Timeout = 604800
+Access-Loop-Encapsulation = 0x000000
+Proxy-State = 0x323531
+
+#
+#  Expected answer
+#
+#  There's not an Accounting-Failed packet type in RADIUS...
+#
+Response-Packet-Type == Access-Accept

diff --git a/src/tests/modules/sql/acct_2_stop.unlang b/src/tests/modules/sql/acct_2_stop.unlang
new file mode 100644 (file)
index 0000000..44e30c2
--- /dev/null
+++ b/src/tests/modules/sql/acct_2_stop.unlang
@@ -0,0 +1,40 @@
+#
+#  PRE: acct_1_update
+#
+sql.accounting
+if (ok) {
+       test_pass
+}
+else {
+       test_fail
+}
+
+update {
+       Tmp-Integer-0 := "%{sql:SELECT count(*) FROM radacct WHERE AcctSessionId = '00000000'}"
+}
+if (!&Tmp-Integer-0 || (&Tmp-Integer-0 != 1)) {
+       test_fail
+}
+else {
+       test_pass
+}
+
+update {
+       Tmp-Integer-0 := "%{sql:SELECT acctsessiontime FROM radacct WHERE AcctSessionId = '00000000'}"
+}
+if (!&Tmp-Integer-0 || (&Tmp-Integer-0 != 120)) {
+       test_fail
+}
+else {
+       test_pass
+}
+
+update {
+       Tmp-String-0 := "%{sql:SELECT AcctTerminateCause FROM radacct WHERE AcctSessionId = '00000000'}"
+}
+if (!&Tmp-String-0 || (&Tmp-String-0 != 'User-Request')) {
+       test_fail
+}
+else {
+       test_pass
+}

diff --git a/src/tests/modules/sql/acct_start_conflict.attrs b/src/tests/modules/sql/acct_start_conflict.attrs
new file mode 100644 (file)
index 0000000..82eeee4
--- /dev/null
+++ b/src/tests/modules/sql/acct_start_conflict.attrs
@@ -0,0 +1,37 @@
+#
+#  Input packet
+#
+User-Name = 'user@example.org'
+NAS-Port = 17826193
+NAS-IP-Address = 192.0.2.10
+Framed-IP-Address = 198.51.100.59
+NAS-Identifier = 'nas.example.org'
+Acct-Status-Type = Start
+Acct-Delay-Time = 1
+Acct-Input-Octets = 0
+Acct-Output-Octets = 0
+Acct-Session-Id = '00000001'
+Acct-Unique-Session-Id = '00000001'
+Acct-Authentic = RADIUS
+Acct-Session-Time = 0
+Acct-Input-Packets = 0
+Acct-Output-Packets = 0
+Acct-Input-Gigawords = 0
+Acct-Output-Gigawords = 0
+Event-Timestamp = 'Feb  1 2015 08:28:58 WIB'
+NAS-Port-Type = Ethernet
+NAS-Port-Id = 'port 001'
+Service-Type = Framed-User
+Framed-Protocol = PPP
+Acct-Link-Count = 0
+Idle-Timeout = 0
+Session-Timeout = 604800
+Access-Loop-Encapsulation = 0x000000
+Proxy-State = 0x323531
+
+#
+#  Expected answer
+#
+#  There's not an Accounting-Failed packet type in RADIUS...
+#
+Response-Packet-Type == Access-Accept

diff --git a/src/tests/modules/sql/acct_start_conflict.unlang b/src/tests/modules/sql/acct_start_conflict.unlang
new file mode 100644 (file)
index 0000000..36db8cc
--- /dev/null
+++ b/src/tests/modules/sql/acct_start_conflict.unlang
@@ -0,0 +1,76 @@
+#
+#  Check that conflicting unique IDs triggers failover to alternative query
+#
+
+#
+#  Clear out old data
+#
+update {
+       Tmp-String-0 := "%{sql:DELETE FROM radacct WHERE AcctSessionId = '00000001'}"
+}
+if (!&Tmp-String-0) {
+       test_fail
+}
+else {
+       test_pass
+}
+
+#
+#  Insert the Accounting-Request start
+#
+sql.accounting
+if (ok) {
+       test_pass
+}
+else {
+       test_fail
+}
+
+#
+#  Check the database has at least one row
+#
+update {
+       Tmp-Integer-0 := "%{sql:SELECT count(*) FROM radacct WHERE AcctSessionId = '00000001'}"
+}
+if (!&Tmp-Integer-0 || (&Tmp-Integer-0 != 1)) {
+       test_fail
+}
+else {
+       test_pass
+}
+
+#
+#  Check acctsessiontime matches the value in the request
+#
+update {
+       Tmp-Integer-0 := "%{sql:SELECT acctsessiontime FROM radacct WHERE AcctSessionId = '00000001'}"
+}
+if (!&Tmp-Integer-0 || (&Tmp-Integer-0 != 0)) {
+       test_fail
+}
+else {
+       test_pass
+}
+
+#
+#  Change acctsessiontime and verify it's updated
+#
+update request {
+       Connect-Info = 'updated'
+}
+sql.accounting
+if (ok) {
+       test_pass
+}
+else {
+       test_fail
+}
+update {
+       Tmp-String-0 := "%{sql:SELECT connectinfo_start FROM radacct WHERE AcctSessionId = '00000001'}"
+}
+if (!&Tmp-Integer-0 || (&Tmp-String-0 != 'updated')) {
+       test_fail
+}
+else {
+       test_pass
+}

diff --git a/src/tests/modules/sql/acct_update_no_start.attrs b/src/tests/modules/sql/acct_update_no_start.attrs
new file mode 100644 (file)
index 0000000..23f46cd
--- /dev/null
+++ b/src/tests/modules/sql/acct_update_no_start.attrs
@@ -0,0 +1,37 @@
+#
+#  Input packet
+#
+User-Name = 'user@example.org'
+NAS-Port = 17826193
+NAS-IP-Address = 192.0.2.10
+Framed-IP-Address = 198.51.100.59
+NAS-Identifier = 'nas.example.org'
+Acct-Status-Type = Interim-Update
+Acct-Delay-Time = 1
+Acct-Input-Octets = 10
+Acct-Output-Octets = 10
+Acct-Session-Id = '00000002'
+Acct-Unique-Session-Id = '00000002'
+Acct-Authentic = RADIUS
+Acct-Session-Time = 30
+Acct-Input-Packets = 10
+Acct-Output-Packets = 10
+Acct-Input-Gigawords = 1
+Acct-Output-Gigawords = 1
+Event-Timestamp = 'Feb  1 2015 08:28:28 WIB'
+NAS-Port-Type = Ethernet
+NAS-Port-Id = 'port 001'
+Service-Type = Framed-User
+Framed-Protocol = PPP
+Acct-Link-Count = 0
+Idle-Timeout = 0
+Session-Timeout = 604800
+Access-Loop-Encapsulation = 0x000000
+Proxy-State = 0x323531
+
+#
+#  Expected answer
+#
+#  There's not an Accounting-Failed packet type in RADIUS...
+#
+Response-Packet-Type == Access-Accept

diff --git a/src/tests/modules/sql/acct_update_no_start.unlang b/src/tests/modules/sql/acct_update_no_start.unlang
new file mode 100644 (file)
index 0000000..7ff75ce
--- /dev/null
+++ b/src/tests/modules/sql/acct_update_no_start.unlang
@@ -0,0 +1,40 @@
+#
+#  Clear out old data
+#
+update {
+       Tmp-String-0 := "%{sql:DELETE FROM radacct WHERE AcctSessionId = '00000002'}"
+}
+if (!&Tmp-String-0) {
+       test_fail
+}
+else {
+       test_pass
+}
+
+sql.accounting
+if (ok) {
+       test_pass
+}
+else {
+       test_fail
+}
+
+update {
+       Tmp-Integer-0 := "%{sql:SELECT count(*) FROM radacct WHERE AcctSessionId = '00000002'}"
+}
+if (!&Tmp-Integer-0 || (&Tmp-Integer-0 != 1)) {
+       test_fail
+}
+else {
+       test_pass
+}
+
+update {
+       Tmp-Integer-0 := "%{sql:SELECT acctsessiontime FROM radacct WHERE AcctSessionId = '00000002'}"
+}
+if (!&Tmp-Integer-0 || (&Tmp-Integer-0 != 30)) {
+       test_fail
+}
+else {
+       test_pass
+}

diff --git a/src/tests/modules/sql/auth.attrs b/src/tests/modules/sql/auth.attrs
new file mode 100644 (file)
index 0000000..73fb40e
--- /dev/null
+++ b/src/tests/modules/sql/auth.attrs
@@ -0,0 +1,12 @@
+#
+#  Input packet
+#
+User-Name = "foo"
+User-Password = "password"
+NAS-IP-Address = "1.2.3.4"
+
+#
+#  Expected answer
+#
+Response-Packet-Type == Access-Accept
+Idle-Timeout == 3600

diff --git a/src/tests/modules/sql/auth.unlang b/src/tests/modules/sql/auth.unlang
new file mode 100644 (file)
index 0000000..361a768
--- /dev/null
+++ b/src/tests/modules/sql/auth.unlang
@@ -0,0 +1,44 @@
+#
+#  Clear out old data
+#
+update {
+       Tmp-String-0 := "%{sql:DELETE FROM radcheck WHERE username = 'foo'}"
+}
+if (!&Tmp-String-0) {
+       test_fail
+}
+else {
+       test_pass
+}
+
+update {
+       Tmp-String-0 := "%{sql:INSERT INTO radcheck (username, attribute, op, value) VALUES ('foo', 'NAS-IP-Address', '==', '1.2.3.4'), ('foo', 'Cleartext-Password', ':=', 'password')}"
+}
+if (!&Tmp-String-0) {
+       test_fail
+}
+else {
+       test_pass
+}
+
+update {
+       Tmp-String-0 := "%{sql:DELETE FROM radreply WHERE username = 'foo'}"
+}
+if (!&Tmp-String-0) {
+       test_fail
+}
+else {
+       test_pass
+}
+
+update {
+       Tmp-String-0 := "%{sql:INSERT INTO radreply (username, attribute, op, value) VALUES ('foo', 'Idle-Timeout', ':=', '3600')}"
+}
+if (!&Tmp-String-0) {
+       test_fail
+}
+else {
+       test_pass
+}
+
+sql

diff --git a/src/tests/modules/sql_mysql/acct_0_start.attrs b/src/tests/modules/sql_mysql/acct_0_start.attrs
deleted file mode 100644 (file)
index ba5e19496ea30fc9f26c06892a54422fe180d9e0..0000000000000000000000000000000000000000
--- a/src/tests/modules/sql_mysql/acct_0_start.attrs
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-#  Input packet
-#
-User-Name = 'user@example.org'
-NAS-Port = 17826193
-NAS-IP-Address = 192.0.2.10
-Framed-IP-Address = 198.51.100.59
-NAS-Identifier = 'nas.example.org'
-Acct-Status-Type = Start
-Acct-Delay-Time = 1
-Acct-Input-Octets = 0
-Acct-Output-Octets = 0
-Acct-Session-Id = '00000000'
-Acct-Unique-Session-Id = '00000000'
-Acct-Authentic = RADIUS
-Acct-Session-Time = 0
-Acct-Input-Packets = 0
-Acct-Output-Packets = 0
-Acct-Input-Gigawords = 0
-Acct-Output-Gigawords = 0
-Event-Timestamp = 'Feb  1 2015 08:28:58 WIB'
-NAS-Port-Type = Ethernet
-NAS-Port-Id = 'port 001'
-Service-Type = Framed-User
-Framed-Protocol = PPP
-Acct-Link-Count = 0
-Idle-Timeout = 0
-Session-Timeout = 604800
-Access-Loop-Encapsulation = 0x000000
-Proxy-State = 0x323531
-
-#
-#  Expected answer
-#
-#  There's not an Accounting-Failed packet type in RADIUS...
-#
-Response-Packet-Type == Access-Accept

diff --git a/src/tests/modules/sql_mysql/acct_0_start.attrs b/src/tests/modules/sql_mysql/acct_0_start.attrs
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..24e17aee7191b910faba3cb033fbd27e07abf2c3
--- /dev/null
+++ b/src/tests/modules/sql_mysql/acct_0_start.attrs
@@ -0,0 +1 @@
+../sql/acct_0_start.attrs
\ No newline at end of file

diff --git a/src/tests/modules/sql_mysql/acct_0_start.unlang b/src/tests/modules/sql_mysql/acct_0_start.unlang
deleted file mode 100644 (file)
index 64921b11630c6864e3ce49b5c4aea3bf09967886..0000000000000000000000000000000000000000
--- a/src/tests/modules/sql_mysql/acct_0_start.unlang
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-#  Clear out old data
-#
-update {
-       Tmp-String-0 := "%{sql:DELETE FROM radacct WHERE AcctSessionId = '00000000'}"
-}
-if (!&Tmp-String-0) {
-       test_fail
-}
-else {
-       test_pass
-}
-
-sql.accounting
-if (ok) {
-       test_pass
-}
-else {
-       test_fail
-}
-
-update {
-       Tmp-Integer-0 := "%{sql:SELECT count(*) FROM radacct WHERE AcctSessionId = '00000000'}"
-}
-if (!&Tmp-Integer-0 || (&Tmp-Integer-0 != 1)) {
-       test_fail
-}
-else {
-       test_pass
-}
-
-update {
-       Tmp-Integer-0 := "%{sql:SELECT acctsessiontime FROM radacct WHERE AcctSessionId = '00000000'}"
-}
-if (!&Tmp-Integer-0 || (&Tmp-Integer-0 != 0)) {
-       test_fail
-}
-else {
-       test_pass
-}

diff --git a/src/tests/modules/sql_mysql/acct_0_start.unlang b/src/tests/modules/sql_mysql/acct_0_start.unlang
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..3fe3e990e270642661009e30088d6eeff09a2e4d
--- /dev/null
+++ b/src/tests/modules/sql_mysql/acct_0_start.unlang
@@ -0,0 +1 @@
+../sql/acct_0_start.unlang
\ No newline at end of file

diff --git a/src/tests/modules/sql_mysql/acct_1_update.attrs b/src/tests/modules/sql_mysql/acct_1_update.attrs
deleted file mode 100644 (file)
index 33f6ec0112e9a474a9e6ecda9b02d148103c25fa..0000000000000000000000000000000000000000
--- a/src/tests/modules/sql_mysql/acct_1_update.attrs
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-#  Input packet
-#
-User-Name = 'user@example.org'
-NAS-Port = 17826193
-NAS-IP-Address = 192.0.2.10
-Framed-IP-Address = 198.51.100.59
-NAS-Identifier = 'nas.example.org'
-Acct-Status-Type = Interim-Update
-Acct-Delay-Time = 1
-Acct-Input-Octets = 10
-Acct-Output-Octets = 10
-Acct-Session-Id = '00000000'
-Acct-Unique-Session-Id = '00000000'
-Acct-Authentic = RADIUS
-Acct-Session-Time = 30
-Acct-Input-Packets = 10
-Acct-Output-Packets = 10
-Acct-Input-Gigawords = 1
-Acct-Output-Gigawords = 1
-Event-Timestamp = 'Feb  1 2015 08:28:28 WIB'
-NAS-Port-Type = Ethernet
-NAS-Port-Id = 'port 001'
-Service-Type = Framed-User
-Framed-Protocol = PPP
-Acct-Link-Count = 0
-Idle-Timeout = 0
-Session-Timeout = 604800
-Access-Loop-Encapsulation = 0x000000
-Proxy-State = 0x323531
-
-#
-#  Expected answer
-#
-#  There's not an Accounting-Failed packet type in RADIUS...
-#
-Response-Packet-Type == Access-Accept

diff --git a/src/tests/modules/sql_mysql/acct_1_update.attrs b/src/tests/modules/sql_mysql/acct_1_update.attrs
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..1ab772da8a5dd663328781ab9696ce8575ef9ed2
--- /dev/null
+++ b/src/tests/modules/sql_mysql/acct_1_update.attrs
@@ -0,0 +1 @@
+../sql/acct_1_update.attrs
\ No newline at end of file

diff --git a/src/tests/modules/sql_mysql/acct_1_update.unlang b/src/tests/modules/sql_mysql/acct_1_update.unlang
deleted file mode 100644 (file)
index a2fa8e434d5ac97562f28f14032a571d30338e36..0000000000000000000000000000000000000000
--- a/src/tests/modules/sql_mysql/acct_1_update.unlang
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-#  PRE: acct_0_start
-#
-sql.accounting
-if (ok) {
-       test_pass
-}
-else {
-       test_fail
-}
-
-update {
-       Tmp-Integer-0 := "%{sql:SELECT count(*) FROM radacct WHERE AcctSessionId = '00000000'}"
-}
-if (!&Tmp-Integer-0 || (&Tmp-Integer-0 != 1)) {
-       test_fail
-}
-else {
-       test_pass
-}
-
-update {
-       Tmp-Integer-0 := "%{sql:SELECT acctsessiontime FROM radacct WHERE AcctSessionId = '00000000'}"
-}
-if (!&Tmp-Integer-0 || (&Tmp-Integer-0 != 30)) {
-       test_fail
-}
-else {
-       test_pass
-}

diff --git a/src/tests/modules/sql_mysql/acct_1_update.unlang b/src/tests/modules/sql_mysql/acct_1_update.unlang
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..b69ff9bc5b862318c50a520a880687d08fda7987
--- /dev/null
+++ b/src/tests/modules/sql_mysql/acct_1_update.unlang
@@ -0,0 +1 @@
+../sql/acct_1_update.unlang
\ No newline at end of file

diff --git a/src/tests/modules/sql_mysql/acct_2_stop.attrs b/src/tests/modules/sql_mysql/acct_2_stop.attrs
deleted file mode 100644 (file)
index b6f18835759b7c99dc975ed50fc97b4ddfa60911..0000000000000000000000000000000000000000
--- a/src/tests/modules/sql_mysql/acct_2_stop.attrs
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-#  Input packet
-#
-User-Name = 'user@example.org'
-NAS-Port = 17826193
-NAS-IP-Address = 192.0.2.10
-Framed-IP-Address = 198.51.100.59
-NAS-Identifier = 'nas.example.org'
-Acct-Status-Type = Interim-Update
-Acct-Delay-Time = 1
-Acct-Input-Octets = 15
-Acct-Output-Octets = 15
-Acct-Session-Id = '00000000'
-Acct-Unique-Session-Id = '00000000'
-Acct-Authentic = RADIUS
-Acct-Session-Time = 60
-Acct-Input-Packets = 15
-Acct-Output-Packets = 15
-Acct-Input-Gigawords = 1
-Acct-Output-Gigawords = 1
-Event-Timestamp = 'Feb  1 2015 08:28:58 WIB'
-NAS-Port-Type = Ethernet
-NAS-Port-Id = 'port 001'
-Service-Type = Framed-User
-Framed-Protocol = PPP
-Acct-Link-Count = 0
-Idle-Timeout = 0
-Session-Timeout = 604800
-Access-Loop-Encapsulation = 0x000000
-Proxy-State = 0x323531
-
-#
-#  Expected answer
-#
-#  There's not an Accounting-Failed packet type in RADIUS...
-#
-Response-Packet-Type == Access-Accept

diff --git a/src/tests/modules/sql_mysql/acct_2_stop.attrs b/src/tests/modules/sql_mysql/acct_2_stop.attrs
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..ea73931dd21defdf839de3df457f3d22a242b237
--- /dev/null
+++ b/src/tests/modules/sql_mysql/acct_2_stop.attrs
@@ -0,0 +1 @@
+../sql/acct_2_stop.attrs
\ No newline at end of file

diff --git a/src/tests/modules/sql_mysql/acct_2_stop.unlang b/src/tests/modules/sql_mysql/acct_2_stop.unlang
deleted file mode 100644 (file)
index 0e319c7ea3a3692466941bd2014baf14d59d6692..0000000000000000000000000000000000000000
--- a/src/tests/modules/sql_mysql/acct_2_stop.unlang
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-#  PRE: acct_1_update
-#
-sql.accounting
-if (ok) {
-       test_pass
-}
-else {
-       test_fail
-}
-
-update {
-       Tmp-Integer-0 := "%{sql:SELECT count(*) FROM radacct WHERE AcctSessionId = '00000000'}"
-}
-if (!&Tmp-Integer-0 || (&Tmp-Integer-0 != 1)) {
-       test_fail
-}
-else {
-       test_pass
-}
-
-update {
-       Tmp-Integer-0 := "%{sql:SELECT acctsessiontime FROM radacct WHERE AcctSessionId = '00000000'}"
-}
-if (!&Tmp-Integer-0 || (&Tmp-Integer-0 != 60)) {
-       test_fail
-}
-else {
-       test_pass
-}

diff --git a/src/tests/modules/sql_mysql/acct_2_stop.unlang b/src/tests/modules/sql_mysql/acct_2_stop.unlang
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..ea0be5693c6264bd409dcb74c96e583bb79582fa
--- /dev/null
+++ b/src/tests/modules/sql_mysql/acct_2_stop.unlang
@@ -0,0 +1 @@
+../sql/acct_2_stop.unlang
\ No newline at end of file

diff --git a/src/tests/modules/sql_mysql/acct_start_conflict.attrs b/src/tests/modules/sql_mysql/acct_start_conflict.attrs
deleted file mode 100644 (file)
index 82eeee43ae442f80237139fcd926349da3aeff76..0000000000000000000000000000000000000000
--- a/src/tests/modules/sql_mysql/acct_start_conflict.attrs
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-#  Input packet
-#
-User-Name = 'user@example.org'
-NAS-Port = 17826193
-NAS-IP-Address = 192.0.2.10
-Framed-IP-Address = 198.51.100.59
-NAS-Identifier = 'nas.example.org'
-Acct-Status-Type = Start
-Acct-Delay-Time = 1
-Acct-Input-Octets = 0
-Acct-Output-Octets = 0
-Acct-Session-Id = '00000001'
-Acct-Unique-Session-Id = '00000001'
-Acct-Authentic = RADIUS
-Acct-Session-Time = 0
-Acct-Input-Packets = 0
-Acct-Output-Packets = 0
-Acct-Input-Gigawords = 0
-Acct-Output-Gigawords = 0
-Event-Timestamp = 'Feb  1 2015 08:28:58 WIB'
-NAS-Port-Type = Ethernet
-NAS-Port-Id = 'port 001'
-Service-Type = Framed-User
-Framed-Protocol = PPP
-Acct-Link-Count = 0
-Idle-Timeout = 0
-Session-Timeout = 604800
-Access-Loop-Encapsulation = 0x000000
-Proxy-State = 0x323531
-
-#
-#  Expected answer
-#
-#  There's not an Accounting-Failed packet type in RADIUS...
-#
-Response-Packet-Type == Access-Accept

diff --git a/src/tests/modules/sql_mysql/acct_start_conflict.attrs b/src/tests/modules/sql_mysql/acct_start_conflict.attrs
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..117a505aab87aa1997884a83fc82a954fb6d236f
--- /dev/null
+++ b/src/tests/modules/sql_mysql/acct_start_conflict.attrs
@@ -0,0 +1 @@
+../sql/acct_start_conflict.attrs
\ No newline at end of file

diff --git a/src/tests/modules/sql_mysql/acct_start_conflict.unlang b/src/tests/modules/sql_mysql/acct_start_conflict.unlang
deleted file mode 100644 (file)
index 4280db4e623aa0122c86e3f2a7026829fd1fc9b8..0000000000000000000000000000000000000000
--- a/src/tests/modules/sql_mysql/acct_start_conflict.unlang
+++ /dev/null
@@ -1,80 +0,0 @@
-#
-#  PRE: acct_2_stop
-#
-
-#
-#  Check that conflicting unique IDs triggers failover to alternative query
-#
-
-#
-#  Clear out old data
-#
-update {
-       Tmp-String-0 := "%{sql:DELETE FROM radacct WHERE AcctSessionId = '00000001'}"
-}
-if (!&Tmp-String-0) {
-       test_fail
-}
-else {
-       test_pass
-}
-
-#
-#  Insert the Accounting-Request start
-#
-sql.accounting
-if (ok) {
-       test_pass
-}
-else {
-       test_fail
-}
-
-#
-#  Check the database has at least one row
-#
-update {
-       Tmp-Integer-0 := "%{sql:SELECT count(*) FROM radacct WHERE AcctSessionId = '00000001'}"
-}
-if (!&Tmp-Integer-0 || (&Tmp-Integer-0 != 1)) {
-       test_fail
-}
-else {
-       test_pass
-}
-
-#
-#  Check acctsessiontime matches the value in the request
-#
-update {
-       Tmp-Integer-0 := "%{sql:SELECT acctsessiontime FROM radacct WHERE AcctSessionId = '00000001'}"
-}
-if (!&Tmp-Integer-0 || (&Tmp-Integer-0 != 0)) {
-       test_fail
-}
-else {
-       test_pass
-}
-
-#
-#  Change acctsessiontime and verify it's updated
-#
-update request {
-       Connect-Info = 'updated'
-}
-sql.accounting
-if (ok) {
-       test_pass
-}
-else {
-       test_pass
-}
-update {
-       Tmp-String-0 := "%{sql:SELECT connectinfo_start FROM radacct WHERE AcctSessionId = '00000001'}"
-}
-if (!&Tmp-Integer-0 || (&Tmp-String-0 != 'updated')) {
-       test_fail
-}
-else {
-       test_pass
-}

diff --git a/src/tests/modules/sql_mysql/acct_start_conflict.unlang b/src/tests/modules/sql_mysql/acct_start_conflict.unlang
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..da357987801874fb0b98cacbc85fa8737ad856f7
--- /dev/null
+++ b/src/tests/modules/sql_mysql/acct_start_conflict.unlang
@@ -0,0 +1 @@
+../sql/acct_start_conflict.unlang
\ No newline at end of file

diff --git a/src/tests/modules/sql_mysql/acct_update_no_start.attrs b/src/tests/modules/sql_mysql/acct_update_no_start.attrs
deleted file mode 100644 (file)
index 23f46cd725059aa4bda415cfc9b69bbe8dead6f0..0000000000000000000000000000000000000000
--- a/src/tests/modules/sql_mysql/acct_update_no_start.attrs
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-#  Input packet
-#
-User-Name = 'user@example.org'
-NAS-Port = 17826193
-NAS-IP-Address = 192.0.2.10
-Framed-IP-Address = 198.51.100.59
-NAS-Identifier = 'nas.example.org'
-Acct-Status-Type = Interim-Update
-Acct-Delay-Time = 1
-Acct-Input-Octets = 10
-Acct-Output-Octets = 10
-Acct-Session-Id = '00000002'
-Acct-Unique-Session-Id = '00000002'
-Acct-Authentic = RADIUS
-Acct-Session-Time = 30
-Acct-Input-Packets = 10
-Acct-Output-Packets = 10
-Acct-Input-Gigawords = 1
-Acct-Output-Gigawords = 1
-Event-Timestamp = 'Feb  1 2015 08:28:28 WIB'
-NAS-Port-Type = Ethernet
-NAS-Port-Id = 'port 001'
-Service-Type = Framed-User
-Framed-Protocol = PPP
-Acct-Link-Count = 0
-Idle-Timeout = 0
-Session-Timeout = 604800
-Access-Loop-Encapsulation = 0x000000
-Proxy-State = 0x323531
-
-#
-#  Expected answer
-#
-#  There's not an Accounting-Failed packet type in RADIUS...
-#
-Response-Packet-Type == Access-Accept

diff --git a/src/tests/modules/sql_mysql/acct_update_no_start.attrs b/src/tests/modules/sql_mysql/acct_update_no_start.attrs
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..328867f219a2f975ebab16f956ebc9ddd79eada9
--- /dev/null
+++ b/src/tests/modules/sql_mysql/acct_update_no_start.attrs
@@ -0,0 +1 @@
+../sql/acct_update_no_start.attrs
\ No newline at end of file

diff --git a/src/tests/modules/sql_mysql/acct_update_no_start.unlang b/src/tests/modules/sql_mysql/acct_update_no_start.unlang
deleted file mode 100644 (file)
index f5025332155e4a4a8b2f997d58eaa4de7a17c841..0000000000000000000000000000000000000000
--- a/src/tests/modules/sql_mysql/acct_update_no_start.unlang
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-#  PRE: acct_start_conflict
-#
-
-#
-#  Clear out old data
-#
-update {
-       Tmp-String-0 := "%{sql:DELETE FROM radacct WHERE AcctSessionId = '00000002'}"
-}
-if (!&Tmp-String-0) {
-       test_fail
-}
-else {
-       test_pass
-}
-
-sql.accounting
-if (ok) {
-       test_pass
-}
-else {
-       test_fail
-}
-
-update {
-       Tmp-Integer-0 := "%{sql:SELECT count(*) FROM radacct WHERE AcctSessionId = '00000002'}"
-}
-if (!&Tmp-Integer-0 || (&Tmp-Integer-0 != 1)) {
-       test_fail
-}
-else {
-       test_pass
-}
-
-update {
-       Tmp-Integer-0 := "%{sql:SELECT acctsessiontime FROM radacct WHERE AcctSessionId = '00000002'}"
-}
-if (!&Tmp-Integer-0 || (&Tmp-Integer-0 != 30)) {
-       test_fail
-}
-else {
-       test_pass
-}

diff --git a/src/tests/modules/sql_mysql/acct_update_no_start.unlang b/src/tests/modules/sql_mysql/acct_update_no_start.unlang
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..6837977f86329ee89fe09db30d66d22451080512
--- /dev/null
+++ b/src/tests/modules/sql_mysql/acct_update_no_start.unlang
@@ -0,0 +1 @@
+../sql/acct_update_no_start.unlang
\ No newline at end of file

diff --git a/src/tests/modules/sql_mysql/auth.attrs b/src/tests/modules/sql_mysql/auth.attrs
deleted file mode 100644 (file)
index 73fb40ede00c20211ec6ae55c982ebefe2e1b434..0000000000000000000000000000000000000000
--- a/src/tests/modules/sql_mysql/auth.attrs
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-#  Input packet
-#
-User-Name = "foo"
-User-Password = "password"
-NAS-IP-Address = "1.2.3.4"
-
-#
-#  Expected answer
-#
-Response-Packet-Type == Access-Accept
-Idle-Timeout == 3600

diff --git a/src/tests/modules/sql_mysql/auth.attrs b/src/tests/modules/sql_mysql/auth.attrs
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..6b30b6b0befd062d9ac0121f2ed593861dbdb095
--- /dev/null
+++ b/src/tests/modules/sql_mysql/auth.attrs
@@ -0,0 +1 @@
+../sql/auth.attrs
\ No newline at end of file

diff --git a/src/tests/modules/sql_mysql/auth.unlang b/src/tests/modules/sql_mysql/auth.unlang
deleted file mode 100644 (file)
index 361a768fd84e3e16563508b79addb1f6ba7b90d8..0000000000000000000000000000000000000000
--- a/src/tests/modules/sql_mysql/auth.unlang
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-#  Clear out old data
-#
-update {
-       Tmp-String-0 := "%{sql:DELETE FROM radcheck WHERE username = 'foo'}"
-}
-if (!&Tmp-String-0) {
-       test_fail
-}
-else {
-       test_pass
-}
-
-update {
-       Tmp-String-0 := "%{sql:INSERT INTO radcheck (username, attribute, op, value) VALUES ('foo', 'NAS-IP-Address', '==', '1.2.3.4'), ('foo', 'Cleartext-Password', ':=', 'password')}"
-}
-if (!&Tmp-String-0) {
-       test_fail
-}
-else {
-       test_pass
-}
-
-update {
-       Tmp-String-0 := "%{sql:DELETE FROM radreply WHERE username = 'foo'}"
-}
-if (!&Tmp-String-0) {
-       test_fail
-}
-else {
-       test_pass
-}
-
-update {
-       Tmp-String-0 := "%{sql:INSERT INTO radreply (username, attribute, op, value) VALUES ('foo', 'Idle-Timeout', ':=', '3600')}"
-}
-if (!&Tmp-String-0) {
-       test_fail
-}
-else {
-       test_pass
-}
-
-sql

diff --git a/src/tests/modules/sql_mysql/auth.unlang b/src/tests/modules/sql_mysql/auth.unlang
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..3ccd80eee6b4c8eebdcb3c426b27fabf6f973cff
--- /dev/null
+++ b/src/tests/modules/sql_mysql/auth.unlang
@@ -0,0 +1 @@
+../sql/auth.unlang
\ No newline at end of file

diff --git a/src/tests/modules/sql_postgresql/acct_0_start.attrs b/src/tests/modules/sql_postgresql/acct_0_start.attrs
deleted file mode 100644 (file)
index ba5e19496ea30fc9f26c06892a54422fe180d9e0..0000000000000000000000000000000000000000
--- a/src/tests/modules/sql_postgresql/acct_0_start.attrs
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-#  Input packet
-#
-User-Name = 'user@example.org'
-NAS-Port = 17826193
-NAS-IP-Address = 192.0.2.10
-Framed-IP-Address = 198.51.100.59
-NAS-Identifier = 'nas.example.org'
-Acct-Status-Type = Start
-Acct-Delay-Time = 1
-Acct-Input-Octets = 0
-Acct-Output-Octets = 0
-Acct-Session-Id = '00000000'
-Acct-Unique-Session-Id = '00000000'
-Acct-Authentic = RADIUS
-Acct-Session-Time = 0
-Acct-Input-Packets = 0
-Acct-Output-Packets = 0
-Acct-Input-Gigawords = 0
-Acct-Output-Gigawords = 0
-Event-Timestamp = 'Feb  1 2015 08:28:58 WIB'
-NAS-Port-Type = Ethernet
-NAS-Port-Id = 'port 001'
-Service-Type = Framed-User
-Framed-Protocol = PPP
-Acct-Link-Count = 0
-Idle-Timeout = 0
-Session-Timeout = 604800
-Access-Loop-Encapsulation = 0x000000
-Proxy-State = 0x323531
-
-#
-#  Expected answer
-#
-#  There's not an Accounting-Failed packet type in RADIUS...
-#
-Response-Packet-Type == Access-Accept

diff --git a/src/tests/modules/sql_postgresql/acct_0_start.attrs b/src/tests/modules/sql_postgresql/acct_0_start.attrs
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..24e17aee7191b910faba3cb033fbd27e07abf2c3
--- /dev/null
+++ b/src/tests/modules/sql_postgresql/acct_0_start.attrs
@@ -0,0 +1 @@
+../sql/acct_0_start.attrs
\ No newline at end of file

diff --git a/src/tests/modules/sql_postgresql/acct_0_start.unlang b/src/tests/modules/sql_postgresql/acct_0_start.unlang
deleted file mode 100644 (file)
index 64921b11630c6864e3ce49b5c4aea3bf09967886..0000000000000000000000000000000000000000
--- a/src/tests/modules/sql_postgresql/acct_0_start.unlang
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-#  Clear out old data
-#
-update {
-       Tmp-String-0 := "%{sql:DELETE FROM radacct WHERE AcctSessionId = '00000000'}"
-}
-if (!&Tmp-String-0) {
-       test_fail
-}
-else {
-       test_pass
-}
-
-sql.accounting
-if (ok) {
-       test_pass
-}
-else {
-       test_fail
-}
-
-update {
-       Tmp-Integer-0 := "%{sql:SELECT count(*) FROM radacct WHERE AcctSessionId = '00000000'}"
-}
-if (!&Tmp-Integer-0 || (&Tmp-Integer-0 != 1)) {
-       test_fail
-}
-else {
-       test_pass
-}
-
-update {
-       Tmp-Integer-0 := "%{sql:SELECT acctsessiontime FROM radacct WHERE AcctSessionId = '00000000'}"
-}
-if (!&Tmp-Integer-0 || (&Tmp-Integer-0 != 0)) {
-       test_fail
-}
-else {
-       test_pass
-}

diff --git a/src/tests/modules/sql_postgresql/acct_0_start.unlang b/src/tests/modules/sql_postgresql/acct_0_start.unlang
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..3fe3e990e270642661009e30088d6eeff09a2e4d
--- /dev/null
+++ b/src/tests/modules/sql_postgresql/acct_0_start.unlang
@@ -0,0 +1 @@
+../sql/acct_0_start.unlang
\ No newline at end of file

diff --git a/src/tests/modules/sql_postgresql/acct_1_update.attrs b/src/tests/modules/sql_postgresql/acct_1_update.attrs
deleted file mode 100644 (file)
index 33f6ec0112e9a474a9e6ecda9b02d148103c25fa..0000000000000000000000000000000000000000
--- a/src/tests/modules/sql_postgresql/acct_1_update.attrs
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-#  Input packet
-#
-User-Name = 'user@example.org'
-NAS-Port = 17826193
-NAS-IP-Address = 192.0.2.10
-Framed-IP-Address = 198.51.100.59
-NAS-Identifier = 'nas.example.org'
-Acct-Status-Type = Interim-Update
-Acct-Delay-Time = 1
-Acct-Input-Octets = 10
-Acct-Output-Octets = 10
-Acct-Session-Id = '00000000'
-Acct-Unique-Session-Id = '00000000'
-Acct-Authentic = RADIUS
-Acct-Session-Time = 30
-Acct-Input-Packets = 10
-Acct-Output-Packets = 10
-Acct-Input-Gigawords = 1
-Acct-Output-Gigawords = 1
-Event-Timestamp = 'Feb  1 2015 08:28:28 WIB'
-NAS-Port-Type = Ethernet
-NAS-Port-Id = 'port 001'
-Service-Type = Framed-User
-Framed-Protocol = PPP
-Acct-Link-Count = 0
-Idle-Timeout = 0
-Session-Timeout = 604800
-Access-Loop-Encapsulation = 0x000000
-Proxy-State = 0x323531
-
-#
-#  Expected answer
-#
-#  There's not an Accounting-Failed packet type in RADIUS...
-#
-Response-Packet-Type == Access-Accept

diff --git a/src/tests/modules/sql_postgresql/acct_1_update.attrs b/src/tests/modules/sql_postgresql/acct_1_update.attrs
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..1ab772da8a5dd663328781ab9696ce8575ef9ed2
--- /dev/null
+++ b/src/tests/modules/sql_postgresql/acct_1_update.attrs
@@ -0,0 +1 @@
+../sql/acct_1_update.attrs
\ No newline at end of file

diff --git a/src/tests/modules/sql_postgresql/acct_1_update.unlang b/src/tests/modules/sql_postgresql/acct_1_update.unlang
deleted file mode 100644 (file)
index a2fa8e434d5ac97562f28f14032a571d30338e36..0000000000000000000000000000000000000000
--- a/src/tests/modules/sql_postgresql/acct_1_update.unlang
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-#  PRE: acct_0_start
-#
-sql.accounting
-if (ok) {
-       test_pass
-}
-else {
-       test_fail
-}
-
-update {
-       Tmp-Integer-0 := "%{sql:SELECT count(*) FROM radacct WHERE AcctSessionId = '00000000'}"
-}
-if (!&Tmp-Integer-0 || (&Tmp-Integer-0 != 1)) {
-       test_fail
-}
-else {
-       test_pass
-}
-
-update {
-       Tmp-Integer-0 := "%{sql:SELECT acctsessiontime FROM radacct WHERE AcctSessionId = '00000000'}"
-}
-if (!&Tmp-Integer-0 || (&Tmp-Integer-0 != 30)) {
-       test_fail
-}
-else {
-       test_pass
-}

diff --git a/src/tests/modules/sql_postgresql/acct_1_update.unlang b/src/tests/modules/sql_postgresql/acct_1_update.unlang
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..b69ff9bc5b862318c50a520a880687d08fda7987
--- /dev/null
+++ b/src/tests/modules/sql_postgresql/acct_1_update.unlang
@@ -0,0 +1 @@
+../sql/acct_1_update.unlang
\ No newline at end of file

diff --git a/src/tests/modules/sql_postgresql/acct_2_stop.attrs b/src/tests/modules/sql_postgresql/acct_2_stop.attrs
deleted file mode 100644 (file)
index d8f9dbc9747878b20903068d3299c19cf82fcaf7..0000000000000000000000000000000000000000
--- a/src/tests/modules/sql_postgresql/acct_2_stop.attrs
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-#  Input packet
-#
-User-Name = 'user@example.org'
-NAS-Port = 17826193
-NAS-IP-Address = 192.0.2.10
-Framed-IP-Address = 198.51.100.59
-NAS-Identifier = 'nas.example.org'
-Acct-Status-Type = Stop
-Acct-Terminate-Cause = User-Request
-Acct-Delay-Time = 1
-Acct-Input-Octets = 15
-Acct-Output-Octets = 15
-Acct-Session-Id = '00000000'
-Acct-Unique-Session-Id = '00000000'
-Acct-Authentic = RADIUS
-Acct-Session-Time = 120
-Acct-Input-Packets = 15
-Acct-Output-Packets = 15
-Acct-Input-Gigawords = 1
-Acct-Output-Gigawords = 1
-Event-Timestamp = 'Feb  1 2015 08:28:58 WIB'
-NAS-Port-Type = Ethernet
-NAS-Port-Id = 'port 001'
-Service-Type = Framed-User
-Framed-Protocol = PPP
-Acct-Link-Count = 0
-Idle-Timeout = 0
-Session-Timeout = 604800
-Access-Loop-Encapsulation = 0x000000
-Proxy-State = 0x323531
-
-#
-#  Expected answer
-#
-#  There's not an Accounting-Failed packet type in RADIUS...
-#
-Response-Packet-Type == Access-Accept

diff --git a/src/tests/modules/sql_postgresql/acct_2_stop.attrs b/src/tests/modules/sql_postgresql/acct_2_stop.attrs
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..ea73931dd21defdf839de3df457f3d22a242b237
--- /dev/null
+++ b/src/tests/modules/sql_postgresql/acct_2_stop.attrs
@@ -0,0 +1 @@
+../sql/acct_2_stop.attrs
\ No newline at end of file

diff --git a/src/tests/modules/sql_postgresql/acct_2_stop.unlang b/src/tests/modules/sql_postgresql/acct_2_stop.unlang
deleted file mode 100644 (file)
index 44e30c25e7008a48698d31852b1bd8b844edb5e6..0000000000000000000000000000000000000000
--- a/src/tests/modules/sql_postgresql/acct_2_stop.unlang
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-#  PRE: acct_1_update
-#
-sql.accounting
-if (ok) {
-       test_pass
-}
-else {
-       test_fail
-}
-
-update {
-       Tmp-Integer-0 := "%{sql:SELECT count(*) FROM radacct WHERE AcctSessionId = '00000000'}"
-}
-if (!&Tmp-Integer-0 || (&Tmp-Integer-0 != 1)) {
-       test_fail
-}
-else {
-       test_pass
-}
-
-update {
-       Tmp-Integer-0 := "%{sql:SELECT acctsessiontime FROM radacct WHERE AcctSessionId = '00000000'}"
-}
-if (!&Tmp-Integer-0 || (&Tmp-Integer-0 != 120)) {
-       test_fail
-}
-else {
-       test_pass
-}
-
-update {
-       Tmp-String-0 := "%{sql:SELECT AcctTerminateCause FROM radacct WHERE AcctSessionId = '00000000'}"
-}
-if (!&Tmp-String-0 || (&Tmp-String-0 != 'User-Request')) {
-       test_fail
-}
-else {
-       test_pass
-}

diff --git a/src/tests/modules/sql_postgresql/acct_2_stop.unlang b/src/tests/modules/sql_postgresql/acct_2_stop.unlang
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..ea0be5693c6264bd409dcb74c96e583bb79582fa
--- /dev/null
+++ b/src/tests/modules/sql_postgresql/acct_2_stop.unlang
@@ -0,0 +1 @@
+../sql/acct_2_stop.unlang
\ No newline at end of file

diff --git a/src/tests/modules/sql_postgresql/acct_start_conflict.attrs b/src/tests/modules/sql_postgresql/acct_start_conflict.attrs
deleted file mode 100644 (file)
index 82eeee43ae442f80237139fcd926349da3aeff76..0000000000000000000000000000000000000000
--- a/src/tests/modules/sql_postgresql/acct_start_conflict.attrs
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-#  Input packet
-#
-User-Name = 'user@example.org'
-NAS-Port = 17826193
-NAS-IP-Address = 192.0.2.10
-Framed-IP-Address = 198.51.100.59
-NAS-Identifier = 'nas.example.org'
-Acct-Status-Type = Start
-Acct-Delay-Time = 1
-Acct-Input-Octets = 0
-Acct-Output-Octets = 0
-Acct-Session-Id = '00000001'
-Acct-Unique-Session-Id = '00000001'
-Acct-Authentic = RADIUS
-Acct-Session-Time = 0
-Acct-Input-Packets = 0
-Acct-Output-Packets = 0
-Acct-Input-Gigawords = 0
-Acct-Output-Gigawords = 0
-Event-Timestamp = 'Feb  1 2015 08:28:58 WIB'
-NAS-Port-Type = Ethernet
-NAS-Port-Id = 'port 001'
-Service-Type = Framed-User
-Framed-Protocol = PPP
-Acct-Link-Count = 0
-Idle-Timeout = 0
-Session-Timeout = 604800
-Access-Loop-Encapsulation = 0x000000
-Proxy-State = 0x323531
-
-#
-#  Expected answer
-#
-#  There's not an Accounting-Failed packet type in RADIUS...
-#
-Response-Packet-Type == Access-Accept

diff --git a/src/tests/modules/sql_postgresql/acct_start_conflict.attrs b/src/tests/modules/sql_postgresql/acct_start_conflict.attrs
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..117a505aab87aa1997884a83fc82a954fb6d236f
--- /dev/null
+++ b/src/tests/modules/sql_postgresql/acct_start_conflict.attrs
@@ -0,0 +1 @@
+../sql/acct_start_conflict.attrs
\ No newline at end of file

diff --git a/src/tests/modules/sql_postgresql/acct_start_conflict.unlang b/src/tests/modules/sql_postgresql/acct_start_conflict.unlang
deleted file mode 100644 (file)
index 36db8cc71ccc5de69f16569ad1e936e998f63888..0000000000000000000000000000000000000000
--- a/src/tests/modules/sql_postgresql/acct_start_conflict.unlang
+++ /dev/null
@@ -1,76 +0,0 @@
-#
-#  Check that conflicting unique IDs triggers failover to alternative query
-#
-
-#
-#  Clear out old data
-#
-update {
-       Tmp-String-0 := "%{sql:DELETE FROM radacct WHERE AcctSessionId = '00000001'}"
-}
-if (!&Tmp-String-0) {
-       test_fail
-}
-else {
-       test_pass
-}
-
-#
-#  Insert the Accounting-Request start
-#
-sql.accounting
-if (ok) {
-       test_pass
-}
-else {
-       test_fail
-}
-
-#
-#  Check the database has at least one row
-#
-update {
-       Tmp-Integer-0 := "%{sql:SELECT count(*) FROM radacct WHERE AcctSessionId = '00000001'}"
-}
-if (!&Tmp-Integer-0 || (&Tmp-Integer-0 != 1)) {
-       test_fail
-}
-else {
-       test_pass
-}
-
-#
-#  Check acctsessiontime matches the value in the request
-#
-update {
-       Tmp-Integer-0 := "%{sql:SELECT acctsessiontime FROM radacct WHERE AcctSessionId = '00000001'}"
-}
-if (!&Tmp-Integer-0 || (&Tmp-Integer-0 != 0)) {
-       test_fail
-}
-else {
-       test_pass
-}
-
-#
-#  Change acctsessiontime and verify it's updated
-#
-update request {
-       Connect-Info = 'updated'
-}
-sql.accounting
-if (ok) {
-       test_pass
-}
-else {
-       test_fail
-}
-update {
-       Tmp-String-0 := "%{sql:SELECT connectinfo_start FROM radacct WHERE AcctSessionId = '00000001'}"
-}
-if (!&Tmp-Integer-0 || (&Tmp-String-0 != 'updated')) {
-       test_fail
-}
-else {
-       test_pass
-}

diff --git a/src/tests/modules/sql_postgresql/acct_start_conflict.unlang b/src/tests/modules/sql_postgresql/acct_start_conflict.unlang
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..da357987801874fb0b98cacbc85fa8737ad856f7
--- /dev/null
+++ b/src/tests/modules/sql_postgresql/acct_start_conflict.unlang
@@ -0,0 +1 @@
+../sql/acct_start_conflict.unlang
\ No newline at end of file

diff --git a/src/tests/modules/sql_postgresql/acct_update_no_start.attrs b/src/tests/modules/sql_postgresql/acct_update_no_start.attrs
deleted file mode 100644 (file)
index 23f46cd725059aa4bda415cfc9b69bbe8dead6f0..0000000000000000000000000000000000000000
--- a/src/tests/modules/sql_postgresql/acct_update_no_start.attrs
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-#  Input packet
-#
-User-Name = 'user@example.org'
-NAS-Port = 17826193
-NAS-IP-Address = 192.0.2.10
-Framed-IP-Address = 198.51.100.59
-NAS-Identifier = 'nas.example.org'
-Acct-Status-Type = Interim-Update
-Acct-Delay-Time = 1
-Acct-Input-Octets = 10
-Acct-Output-Octets = 10
-Acct-Session-Id = '00000002'
-Acct-Unique-Session-Id = '00000002'
-Acct-Authentic = RADIUS
-Acct-Session-Time = 30
-Acct-Input-Packets = 10
-Acct-Output-Packets = 10
-Acct-Input-Gigawords = 1
-Acct-Output-Gigawords = 1
-Event-Timestamp = 'Feb  1 2015 08:28:28 WIB'
-NAS-Port-Type = Ethernet
-NAS-Port-Id = 'port 001'
-Service-Type = Framed-User
-Framed-Protocol = PPP
-Acct-Link-Count = 0
-Idle-Timeout = 0
-Session-Timeout = 604800
-Access-Loop-Encapsulation = 0x000000
-Proxy-State = 0x323531
-
-#
-#  Expected answer
-#
-#  There's not an Accounting-Failed packet type in RADIUS...
-#
-Response-Packet-Type == Access-Accept

diff --git a/src/tests/modules/sql_postgresql/acct_update_no_start.attrs b/src/tests/modules/sql_postgresql/acct_update_no_start.attrs
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..328867f219a2f975ebab16f956ebc9ddd79eada9
--- /dev/null
+++ b/src/tests/modules/sql_postgresql/acct_update_no_start.attrs
@@ -0,0 +1 @@
+../sql/acct_update_no_start.attrs
\ No newline at end of file

diff --git a/src/tests/modules/sql_postgresql/acct_update_no_start.unlang b/src/tests/modules/sql_postgresql/acct_update_no_start.unlang
deleted file mode 100644 (file)
index 7ff75ce6eacd3d3fe6c395232e01e09dc1ce60e6..0000000000000000000000000000000000000000
--- a/src/tests/modules/sql_postgresql/acct_update_no_start.unlang
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-#  Clear out old data
-#
-update {
-       Tmp-String-0 := "%{sql:DELETE FROM radacct WHERE AcctSessionId = '00000002'}"
-}
-if (!&Tmp-String-0) {
-       test_fail
-}
-else {
-       test_pass
-}
-
-sql.accounting
-if (ok) {
-       test_pass
-}
-else {
-       test_fail
-}
-
-update {
-       Tmp-Integer-0 := "%{sql:SELECT count(*) FROM radacct WHERE AcctSessionId = '00000002'}"
-}
-if (!&Tmp-Integer-0 || (&Tmp-Integer-0 != 1)) {
-       test_fail
-}
-else {
-       test_pass
-}
-
-update {
-       Tmp-Integer-0 := "%{sql:SELECT acctsessiontime FROM radacct WHERE AcctSessionId = '00000002'}"
-}
-if (!&Tmp-Integer-0 || (&Tmp-Integer-0 != 30)) {
-       test_fail
-}
-else {
-       test_pass
-}

diff --git a/src/tests/modules/sql_postgresql/acct_update_no_start.unlang b/src/tests/modules/sql_postgresql/acct_update_no_start.unlang
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..6837977f86329ee89fe09db30d66d22451080512
--- /dev/null
+++ b/src/tests/modules/sql_postgresql/acct_update_no_start.unlang
@@ -0,0 +1 @@
+../sql/acct_update_no_start.unlang
\ No newline at end of file

diff --git a/src/tests/modules/sql_postgresql/auth.attrs b/src/tests/modules/sql_postgresql/auth.attrs
deleted file mode 100644 (file)
index 73fb40ede00c20211ec6ae55c982ebefe2e1b434..0000000000000000000000000000000000000000
--- a/src/tests/modules/sql_postgresql/auth.attrs
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-#  Input packet
-#
-User-Name = "foo"
-User-Password = "password"
-NAS-IP-Address = "1.2.3.4"
-
-#
-#  Expected answer
-#
-Response-Packet-Type == Access-Accept
-Idle-Timeout == 3600

diff --git a/src/tests/modules/sql_postgresql/auth.attrs b/src/tests/modules/sql_postgresql/auth.attrs
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..6b30b6b0befd062d9ac0121f2ed593861dbdb095
--- /dev/null
+++ b/src/tests/modules/sql_postgresql/auth.attrs
@@ -0,0 +1 @@
+../sql/auth.attrs
\ No newline at end of file

diff --git a/src/tests/modules/sql_postgresql/auth.unlang b/src/tests/modules/sql_postgresql/auth.unlang
deleted file mode 100644 (file)
index 361a768fd84e3e16563508b79addb1f6ba7b90d8..0000000000000000000000000000000000000000
--- a/src/tests/modules/sql_postgresql/auth.unlang
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-#  Clear out old data
-#
-update {
-       Tmp-String-0 := "%{sql:DELETE FROM radcheck WHERE username = 'foo'}"
-}
-if (!&Tmp-String-0) {
-       test_fail
-}
-else {
-       test_pass
-}
-
-update {
-       Tmp-String-0 := "%{sql:INSERT INTO radcheck (username, attribute, op, value) VALUES ('foo', 'NAS-IP-Address', '==', '1.2.3.4'), ('foo', 'Cleartext-Password', ':=', 'password')}"
-}
-if (!&Tmp-String-0) {
-       test_fail
-}
-else {
-       test_pass
-}
-
-update {
-       Tmp-String-0 := "%{sql:DELETE FROM radreply WHERE username = 'foo'}"
-}
-if (!&Tmp-String-0) {
-       test_fail
-}
-else {
-       test_pass
-}
-
-update {
-       Tmp-String-0 := "%{sql:INSERT INTO radreply (username, attribute, op, value) VALUES ('foo', 'Idle-Timeout', ':=', '3600')}"
-}
-if (!&Tmp-String-0) {
-       test_fail
-}
-else {
-       test_pass
-}
-
-sql

diff --git a/src/tests/modules/sql_postgresql/auth.unlang b/src/tests/modules/sql_postgresql/auth.unlang
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..3ccd80eee6b4c8eebdcb3c426b27fabf6f973cff
--- /dev/null
+++ b/src/tests/modules/sql_postgresql/auth.unlang
@@ -0,0 +1 @@
+../sql/auth.unlang
\ No newline at end of file

diff --git a/src/tests/modules/sql_sqlite/acct_0_start.attrs b/src/tests/modules/sql_sqlite/acct_0_start.attrs
deleted file mode 100644 (file)
index ba5e19496ea30fc9f26c06892a54422fe180d9e0..0000000000000000000000000000000000000000
--- a/src/tests/modules/sql_sqlite/acct_0_start.attrs
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-#  Input packet
-#
-User-Name = 'user@example.org'
-NAS-Port = 17826193
-NAS-IP-Address = 192.0.2.10
-Framed-IP-Address = 198.51.100.59
-NAS-Identifier = 'nas.example.org'
-Acct-Status-Type = Start
-Acct-Delay-Time = 1
-Acct-Input-Octets = 0
-Acct-Output-Octets = 0
-Acct-Session-Id = '00000000'
-Acct-Unique-Session-Id = '00000000'
-Acct-Authentic = RADIUS
-Acct-Session-Time = 0
-Acct-Input-Packets = 0
-Acct-Output-Packets = 0
-Acct-Input-Gigawords = 0
-Acct-Output-Gigawords = 0
-Event-Timestamp = 'Feb  1 2015 08:28:58 WIB'
-NAS-Port-Type = Ethernet
-NAS-Port-Id = 'port 001'
-Service-Type = Framed-User
-Framed-Protocol = PPP
-Acct-Link-Count = 0
-Idle-Timeout = 0
-Session-Timeout = 604800
-Access-Loop-Encapsulation = 0x000000
-Proxy-State = 0x323531
-
-#
-#  Expected answer
-#
-#  There's not an Accounting-Failed packet type in RADIUS...
-#
-Response-Packet-Type == Access-Accept

diff --git a/src/tests/modules/sql_sqlite/acct_0_start.attrs b/src/tests/modules/sql_sqlite/acct_0_start.attrs
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..24e17aee7191b910faba3cb033fbd27e07abf2c3
--- /dev/null
+++ b/src/tests/modules/sql_sqlite/acct_0_start.attrs
@@ -0,0 +1 @@
+../sql/acct_0_start.attrs
\ No newline at end of file

diff --git a/src/tests/modules/sql_sqlite/acct_0_start.unlang b/src/tests/modules/sql_sqlite/acct_0_start.unlang
deleted file mode 100644 (file)
index 64921b11630c6864e3ce49b5c4aea3bf09967886..0000000000000000000000000000000000000000
--- a/src/tests/modules/sql_sqlite/acct_0_start.unlang
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-#  Clear out old data
-#
-update {
-       Tmp-String-0 := "%{sql:DELETE FROM radacct WHERE AcctSessionId = '00000000'}"
-}
-if (!&Tmp-String-0) {
-       test_fail
-}
-else {
-       test_pass
-}
-
-sql.accounting
-if (ok) {
-       test_pass
-}
-else {
-       test_fail
-}
-
-update {
-       Tmp-Integer-0 := "%{sql:SELECT count(*) FROM radacct WHERE AcctSessionId = '00000000'}"
-}
-if (!&Tmp-Integer-0 || (&Tmp-Integer-0 != 1)) {
-       test_fail
-}
-else {
-       test_pass
-}
-
-update {
-       Tmp-Integer-0 := "%{sql:SELECT acctsessiontime FROM radacct WHERE AcctSessionId = '00000000'}"
-}
-if (!&Tmp-Integer-0 || (&Tmp-Integer-0 != 0)) {
-       test_fail
-}
-else {
-       test_pass
-}

diff --git a/src/tests/modules/sql_sqlite/acct_0_start.unlang b/src/tests/modules/sql_sqlite/acct_0_start.unlang
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..3fe3e990e270642661009e30088d6eeff09a2e4d
--- /dev/null
+++ b/src/tests/modules/sql_sqlite/acct_0_start.unlang
@@ -0,0 +1 @@
+../sql/acct_0_start.unlang
\ No newline at end of file

diff --git a/src/tests/modules/sql_sqlite/acct_1_update.attrs b/src/tests/modules/sql_sqlite/acct_1_update.attrs
deleted file mode 100644 (file)
index 33f6ec0112e9a474a9e6ecda9b02d148103c25fa..0000000000000000000000000000000000000000
--- a/src/tests/modules/sql_sqlite/acct_1_update.attrs
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-#  Input packet
-#
-User-Name = 'user@example.org'
-NAS-Port = 17826193
-NAS-IP-Address = 192.0.2.10
-Framed-IP-Address = 198.51.100.59
-NAS-Identifier = 'nas.example.org'
-Acct-Status-Type = Interim-Update
-Acct-Delay-Time = 1
-Acct-Input-Octets = 10
-Acct-Output-Octets = 10
-Acct-Session-Id = '00000000'
-Acct-Unique-Session-Id = '00000000'
-Acct-Authentic = RADIUS
-Acct-Session-Time = 30
-Acct-Input-Packets = 10
-Acct-Output-Packets = 10
-Acct-Input-Gigawords = 1
-Acct-Output-Gigawords = 1
-Event-Timestamp = 'Feb  1 2015 08:28:28 WIB'
-NAS-Port-Type = Ethernet
-NAS-Port-Id = 'port 001'
-Service-Type = Framed-User
-Framed-Protocol = PPP
-Acct-Link-Count = 0
-Idle-Timeout = 0
-Session-Timeout = 604800
-Access-Loop-Encapsulation = 0x000000
-Proxy-State = 0x323531
-
-#
-#  Expected answer
-#
-#  There's not an Accounting-Failed packet type in RADIUS...
-#
-Response-Packet-Type == Access-Accept

diff --git a/src/tests/modules/sql_sqlite/acct_1_update.attrs b/src/tests/modules/sql_sqlite/acct_1_update.attrs
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..1ab772da8a5dd663328781ab9696ce8575ef9ed2
--- /dev/null
+++ b/src/tests/modules/sql_sqlite/acct_1_update.attrs
@@ -0,0 +1 @@
+../sql/acct_1_update.attrs
\ No newline at end of file

diff --git a/src/tests/modules/sql_sqlite/acct_1_update.unlang b/src/tests/modules/sql_sqlite/acct_1_update.unlang
deleted file mode 100644 (file)
index 4b2113332bdd4fffeae0fab396f1fc4f6bdaaebf..0000000000000000000000000000000000000000
--- a/src/tests/modules/sql_sqlite/acct_1_update.unlang
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-#  PRE: acct_0_start
-#
-sql.accounting
-if (ok) {
-       test_pass
-}
-else {
-       test_fail
-}
-
-update {
-       Tmp-Integer-0 := "%{sql:SELECT count(*) FROM radacct WHERE AcctSessionId = '00000000'}"
-}
-if (!&Tmp-Integer-0 || (&Tmp-Integer-0 != 1)) {
-       test_fail
-}
-else {
-       test_pass
-}
-
-update {
-       Tmp-Integer-0 := "%{sql:SELECT acctsessiontime FROM radacct WHERE AcctSessionId = '00000000'}"
-}
-if (!&Tmp-Integer-0 || (&Tmp-Integer-0 != 30)) {
-       test_fail
-}
-else {
-       test_pass
-}
-

diff --git a/src/tests/modules/sql_sqlite/acct_1_update.unlang b/src/tests/modules/sql_sqlite/acct_1_update.unlang
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..b69ff9bc5b862318c50a520a880687d08fda7987
--- /dev/null
+++ b/src/tests/modules/sql_sqlite/acct_1_update.unlang
@@ -0,0 +1 @@
+../sql/acct_1_update.unlang
\ No newline at end of file

diff --git a/src/tests/modules/sql_sqlite/acct_2_stop.attrs b/src/tests/modules/sql_sqlite/acct_2_stop.attrs
deleted file mode 100644 (file)
index b6f18835759b7c99dc975ed50fc97b4ddfa60911..0000000000000000000000000000000000000000
--- a/src/tests/modules/sql_sqlite/acct_2_stop.attrs
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-#  Input packet
-#
-User-Name = 'user@example.org'
-NAS-Port = 17826193
-NAS-IP-Address = 192.0.2.10
-Framed-IP-Address = 198.51.100.59
-NAS-Identifier = 'nas.example.org'
-Acct-Status-Type = Interim-Update
-Acct-Delay-Time = 1
-Acct-Input-Octets = 15
-Acct-Output-Octets = 15
-Acct-Session-Id = '00000000'
-Acct-Unique-Session-Id = '00000000'
-Acct-Authentic = RADIUS
-Acct-Session-Time = 60
-Acct-Input-Packets = 15
-Acct-Output-Packets = 15
-Acct-Input-Gigawords = 1
-Acct-Output-Gigawords = 1
-Event-Timestamp = 'Feb  1 2015 08:28:58 WIB'
-NAS-Port-Type = Ethernet
-NAS-Port-Id = 'port 001'
-Service-Type = Framed-User
-Framed-Protocol = PPP
-Acct-Link-Count = 0
-Idle-Timeout = 0
-Session-Timeout = 604800
-Access-Loop-Encapsulation = 0x000000
-Proxy-State = 0x323531
-
-#
-#  Expected answer
-#
-#  There's not an Accounting-Failed packet type in RADIUS...
-#
-Response-Packet-Type == Access-Accept

diff --git a/src/tests/modules/sql_sqlite/acct_2_stop.attrs b/src/tests/modules/sql_sqlite/acct_2_stop.attrs
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..ea73931dd21defdf839de3df457f3d22a242b237
--- /dev/null
+++ b/src/tests/modules/sql_sqlite/acct_2_stop.attrs
@@ -0,0 +1 @@
+../sql/acct_2_stop.attrs
\ No newline at end of file

diff --git a/src/tests/modules/sql_sqlite/acct_2_stop.unlang b/src/tests/modules/sql_sqlite/acct_2_stop.unlang
deleted file mode 100644 (file)
index 0e319c7ea3a3692466941bd2014baf14d59d6692..0000000000000000000000000000000000000000
--- a/src/tests/modules/sql_sqlite/acct_2_stop.unlang
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-#  PRE: acct_1_update
-#
-sql.accounting
-if (ok) {
-       test_pass
-}
-else {
-       test_fail
-}
-
-update {
-       Tmp-Integer-0 := "%{sql:SELECT count(*) FROM radacct WHERE AcctSessionId = '00000000'}"
-}
-if (!&Tmp-Integer-0 || (&Tmp-Integer-0 != 1)) {
-       test_fail
-}
-else {
-       test_pass
-}
-
-update {
-       Tmp-Integer-0 := "%{sql:SELECT acctsessiontime FROM radacct WHERE AcctSessionId = '00000000'}"
-}
-if (!&Tmp-Integer-0 || (&Tmp-Integer-0 != 60)) {
-       test_fail
-}
-else {
-       test_pass
-}

diff --git a/src/tests/modules/sql_sqlite/acct_2_stop.unlang b/src/tests/modules/sql_sqlite/acct_2_stop.unlang
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..ea0be5693c6264bd409dcb74c96e583bb79582fa
--- /dev/null
+++ b/src/tests/modules/sql_sqlite/acct_2_stop.unlang
@@ -0,0 +1 @@
+../sql/acct_2_stop.unlang
\ No newline at end of file

diff --git a/src/tests/modules/sql_sqlite/acct_start_conflict.attrs b/src/tests/modules/sql_sqlite/acct_start_conflict.attrs
deleted file mode 100644 (file)
index 82eeee43ae442f80237139fcd926349da3aeff76..0000000000000000000000000000000000000000
--- a/src/tests/modules/sql_sqlite/acct_start_conflict.attrs
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-#  Input packet
-#
-User-Name = 'user@example.org'
-NAS-Port = 17826193
-NAS-IP-Address = 192.0.2.10
-Framed-IP-Address = 198.51.100.59
-NAS-Identifier = 'nas.example.org'
-Acct-Status-Type = Start
-Acct-Delay-Time = 1
-Acct-Input-Octets = 0
-Acct-Output-Octets = 0
-Acct-Session-Id = '00000001'
-Acct-Unique-Session-Id = '00000001'
-Acct-Authentic = RADIUS
-Acct-Session-Time = 0
-Acct-Input-Packets = 0
-Acct-Output-Packets = 0
-Acct-Input-Gigawords = 0
-Acct-Output-Gigawords = 0
-Event-Timestamp = 'Feb  1 2015 08:28:58 WIB'
-NAS-Port-Type = Ethernet
-NAS-Port-Id = 'port 001'
-Service-Type = Framed-User
-Framed-Protocol = PPP
-Acct-Link-Count = 0
-Idle-Timeout = 0
-Session-Timeout = 604800
-Access-Loop-Encapsulation = 0x000000
-Proxy-State = 0x323531
-
-#
-#  Expected answer
-#
-#  There's not an Accounting-Failed packet type in RADIUS...
-#
-Response-Packet-Type == Access-Accept

diff --git a/src/tests/modules/sql_sqlite/acct_start_conflict.attrs b/src/tests/modules/sql_sqlite/acct_start_conflict.attrs
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..117a505aab87aa1997884a83fc82a954fb6d236f
--- /dev/null
+++ b/src/tests/modules/sql_sqlite/acct_start_conflict.attrs
@@ -0,0 +1 @@
+../sql/acct_start_conflict.attrs
\ No newline at end of file

diff --git a/src/tests/modules/sql_sqlite/acct_start_conflict.unlang b/src/tests/modules/sql_sqlite/acct_start_conflict.unlang
deleted file mode 100644 (file)
index 81b3f84e6eda49b94a3ec09758f182d9d05fb743..0000000000000000000000000000000000000000
--- a/src/tests/modules/sql_sqlite/acct_start_conflict.unlang
+++ /dev/null
@@ -1,78 +0,0 @@
-#
-#  PRE: acct_2_stop
-#
-#  Check that conflicting unique IDs triggers failover to alternative query
-#
-
-#
-#  Clear out old data
-#
-update {
-       Tmp-String-0 := "%{sql:DELETE FROM radacct WHERE AcctSessionId = '00000001'}"
-}
-if (!&Tmp-String-0) {
-       test_fail
-}
-else {
-       test_pass
-}
-
-#
-#  Insert the Accounting-Request start
-#
-sql.accounting
-if (ok) {
-       test_pass
-}
-else {
-       test_fail
-}
-
-#
-#  Check the database has at least one row
-#
-update {
-       Tmp-Integer-0 := "%{sql:SELECT count(*) FROM radacct WHERE AcctSessionId = '00000001'}"
-}
-if (!&Tmp-Integer-0 || (&Tmp-Integer-0 != 1)) {
-       test_fail
-}
-else {
-       test_pass
-}
-
-#
-#  Check acctsessiontime matches the value in the request
-#
-update {
-       Tmp-Integer-0 := "%{sql:SELECT acctsessiontime FROM radacct WHERE AcctSessionId = '00000001'}"
-}
-if (!&Tmp-Integer-0 || (&Tmp-Integer-0 != 0)) {
-       test_fail
-}
-else {
-       test_pass
-}
-
-#
-#  Change acctsessiontime and verify it's updated
-#
-update request {
-       Connect-Info = 'updated'
-}
-sql.accounting
-if (ok) {
-       test_pass
-}
-else {
-       test_pass
-}
-update {
-       Tmp-String-0 := "%{sql:SELECT connectinfo_start FROM radacct WHERE AcctSessionId = '00000001'}"
-}
-if (!&Tmp-Integer-0 || (&Tmp-String-0 != 'updated')) {
-       test_fail
-}
-else {
-       test_pass
-}

diff --git a/src/tests/modules/sql_sqlite/acct_start_conflict.unlang b/src/tests/modules/sql_sqlite/acct_start_conflict.unlang
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..da357987801874fb0b98cacbc85fa8737ad856f7
--- /dev/null
+++ b/src/tests/modules/sql_sqlite/acct_start_conflict.unlang
@@ -0,0 +1 @@
+../sql/acct_start_conflict.unlang
\ No newline at end of file

diff --git a/src/tests/modules/sql_sqlite/acct_update_no_start.attrs b/src/tests/modules/sql_sqlite/acct_update_no_start.attrs
deleted file mode 100644 (file)
index 23f46cd725059aa4bda415cfc9b69bbe8dead6f0..0000000000000000000000000000000000000000
--- a/src/tests/modules/sql_sqlite/acct_update_no_start.attrs
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-#  Input packet
-#
-User-Name = 'user@example.org'
-NAS-Port = 17826193
-NAS-IP-Address = 192.0.2.10
-Framed-IP-Address = 198.51.100.59
-NAS-Identifier = 'nas.example.org'
-Acct-Status-Type = Interim-Update
-Acct-Delay-Time = 1
-Acct-Input-Octets = 10
-Acct-Output-Octets = 10
-Acct-Session-Id = '00000002'
-Acct-Unique-Session-Id = '00000002'
-Acct-Authentic = RADIUS
-Acct-Session-Time = 30
-Acct-Input-Packets = 10
-Acct-Output-Packets = 10
-Acct-Input-Gigawords = 1
-Acct-Output-Gigawords = 1
-Event-Timestamp = 'Feb  1 2015 08:28:28 WIB'
-NAS-Port-Type = Ethernet
-NAS-Port-Id = 'port 001'
-Service-Type = Framed-User
-Framed-Protocol = PPP
-Acct-Link-Count = 0
-Idle-Timeout = 0
-Session-Timeout = 604800
-Access-Loop-Encapsulation = 0x000000
-Proxy-State = 0x323531
-
-#
-#  Expected answer
-#
-#  There's not an Accounting-Failed packet type in RADIUS...
-#
-Response-Packet-Type == Access-Accept

diff --git a/src/tests/modules/sql_sqlite/acct_update_no_start.attrs b/src/tests/modules/sql_sqlite/acct_update_no_start.attrs
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..328867f219a2f975ebab16f956ebc9ddd79eada9
--- /dev/null
+++ b/src/tests/modules/sql_sqlite/acct_update_no_start.attrs
@@ -0,0 +1 @@
+../sql/acct_update_no_start.attrs
\ No newline at end of file

diff --git a/src/tests/modules/sql_sqlite/acct_update_no_start.unlang b/src/tests/modules/sql_sqlite/acct_update_no_start.unlang
deleted file mode 100644 (file)
index c47208439e33e7a32c062b7fc1df83109f73b86a..0000000000000000000000000000000000000000
--- a/src/tests/modules/sql_sqlite/acct_update_no_start.unlang
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# PRE: acct_start_conflict
-#
-#  Clear out old data
-#
-update {
-       Tmp-String-0 := "%{sql:DELETE FROM radacct WHERE AcctSessionId = '00000002'}"
-}
-if (!&Tmp-String-0) {
-       test_fail
-}
-else {
-       test_pass
-}
-
-sql.accounting
-if (ok) {
-       test_pass
-}
-else {
-       test_fail
-}
-
-update {
-       Tmp-Integer-0 := "%{sql:SELECT count(*) FROM radacct WHERE AcctSessionId = '00000002'}"
-}
-if (!&Tmp-Integer-0 || (&Tmp-Integer-0 != 1)) {
-       test_fail
-}
-else {
-       test_pass
-}
-
-update {
-       Tmp-Integer-0 := "%{sql:SELECT acctsessiontime FROM radacct WHERE AcctSessionId = '00000002'}"
-}
-if (!&Tmp-Integer-0 || (&Tmp-Integer-0 != 30)) {
-       test_fail
-}
-else {
-       test_pass
-}
-

diff --git a/src/tests/modules/sql_sqlite/acct_update_no_start.unlang b/src/tests/modules/sql_sqlite/acct_update_no_start.unlang
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..6837977f86329ee89fe09db30d66d22451080512
--- /dev/null
+++ b/src/tests/modules/sql_sqlite/acct_update_no_start.unlang
@@ -0,0 +1 @@
+../sql/acct_update_no_start.unlang
\ No newline at end of file

diff --git a/src/tests/modules/sql_sqlite/auth.attrs b/src/tests/modules/sql_sqlite/auth.attrs
new file mode 120000 (symlink)
index 0000000..6b30b6b
--- /dev/null
+++ b/src/tests/modules/sql_sqlite/auth.attrs
@@ -0,0 +1 @@
+../sql/auth.attrs
\ No newline at end of file

diff --git a/src/tests/modules/sql_sqlite/auth.unlang b/src/tests/modules/sql_sqlite/auth.unlang
new file mode 120000 (symlink)
index 0000000..3ccd80e
--- /dev/null
+++ b/src/tests/modules/sql_sqlite/auth.unlang
@@ -0,0 +1 @@
+../sql/auth.unlang
\ No newline at end of file