Make SQL test User-Names unique

so that we can do "make -j 4" without the tests stomping
on each other

diff --git a/src/tests/modules/sql/README b/src/tests/modules/sql/README
index 5458b9b1c2de5b053d96020a07e93a02c78ad122..b5e79e2f5307615bd77b74fcbf451a50a60768c8 100644 (file)
--- a/src/tests/modules/sql/README
+++ b/src/tests/modules/sql/README
@@ -1 +1,7 @@
 All SQL related tests should be defined here and the driver specific directory need only have links to the tests defined here.
+
+All User-Name attributes, Acct-Session-Id, and Acct-Multi-Session-Id attributes
+
+       MUST BE UNIQUE FOR EVERY TEST.
+
+Otherwise the tests will stomp on each other when run in parallel.

diff --git a/src/tests/modules/sql/acct_0_start.attrs b/src/tests/modules/sql/acct_0_start.attrs
index ba5e19496ea30fc9f26c06892a54422fe180d9e0..01257ce2de020c5d868134b90b403fdeb5922466 100644 (file)
--- a/src/tests/modules/sql/acct_0_start.attrs
+++ b/src/tests/modules/sql/acct_0_start.attrs
@@ -1,7 +1,7 @@
 #
 #  Input packet
 #
-User-Name = 'user@example.org'
+User-Name = 'user0@example.org'
 NAS-Port = 17826193
 NAS-IP-Address = 192.0.2.10
 Framed-IP-Address = 198.51.100.59

diff --git a/src/tests/modules/sql/acct_1_update.attrs b/src/tests/modules/sql/acct_1_update.attrs
index 33f6ec0112e9a474a9e6ecda9b02d148103c25fa..0c20e4d60bc872d0ccba9e05914a28c416ae00da 100644 (file)
--- a/src/tests/modules/sql/acct_1_update.attrs
+++ b/src/tests/modules/sql/acct_1_update.attrs
@@ -1,7 +1,7 @@
 #
 #  Input packet
 #
-User-Name = 'user@example.org'
+User-Name = 'user2@example.org'
 NAS-Port = 17826193
 NAS-IP-Address = 192.0.2.10
 Framed-IP-Address = 198.51.100.59

diff --git a/src/tests/modules/sql/acct_2_stop.attrs b/src/tests/modules/sql/acct_2_stop.attrs
index d8f9dbc9747878b20903068d3299c19cf82fcaf7..e932f84794ed22c567d4702c00248a33e36311d0 100644 (file)
--- a/src/tests/modules/sql/acct_2_stop.attrs
+++ b/src/tests/modules/sql/acct_2_stop.attrs
@@ -1,7 +1,7 @@
 #
 #  Input packet
 #
-User-Name = 'user@example.org'
+User-Name = 'user2@example.org'
 NAS-Port = 17826193
 NAS-IP-Address = 192.0.2.10
 Framed-IP-Address = 198.51.100.59
@@ -11,8 +11,8 @@ 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-Session-Id = '00000002'
+Acct-Unique-Session-Id = '00000002'
 Acct-Authentic = RADIUS
 Acct-Session-Time = 120
 Acct-Input-Packets = 15

diff --git a/src/tests/modules/sql/acct_2_stop.unlang b/src/tests/modules/sql/acct_2_stop.unlang
index 44e30c25e7008a48698d31852b1bd8b844edb5e6..3386c71e4e3a19c3e4515e0965d9ae7c58bf3595 100644 (file)
--- a/src/tests/modules/sql/acct_2_stop.unlang
+++ b/src/tests/modules/sql/acct_2_stop.unlang
@@ -10,7 +10,7 @@ else {
 }
 
 update {
-       Tmp-Integer-0 := "%{sql:SELECT count(*) FROM radacct WHERE AcctSessionId = '00000000'}"
+       Tmp-Integer-0 := "%{sql:SELECT count(*) FROM radacct WHERE AcctSessionId = '00000002'}"
 }
 if (!&Tmp-Integer-0 || (&Tmp-Integer-0 != 1)) {
        test_fail
@@ -20,7 +20,7 @@ else {
 }
 
 update {
-       Tmp-Integer-0 := "%{sql:SELECT acctsessiontime FROM radacct WHERE AcctSessionId = '00000000'}"
+       Tmp-Integer-0 := "%{sql:SELECT acctsessiontime FROM radacct WHERE AcctSessionId = '00000002'}"
 }
 if (!&Tmp-Integer-0 || (&Tmp-Integer-0 != 120)) {
        test_fail
@@ -30,7 +30,7 @@ else {
 }
 
 update {
-       Tmp-String-0 := "%{sql:SELECT AcctTerminateCause FROM radacct WHERE AcctSessionId = '00000000'}"
+       Tmp-String-0 := "%{sql:SELECT AcctTerminateCause FROM radacct WHERE AcctSessionId = '00000002'}"
 }
 if (!&Tmp-String-0 || (&Tmp-String-0 != 'User-Request')) {
        test_fail

diff --git a/src/tests/modules/sql/acct_start_conflict.attrs b/src/tests/modules/sql/acct_start_conflict.attrs
index 82eeee43ae442f80237139fcd926349da3aeff76..2bcade3cd49f69051f5cb64a42fa3e00f9538e01 100644 (file)
--- a/src/tests/modules/sql/acct_start_conflict.attrs
+++ b/src/tests/modules/sql/acct_start_conflict.attrs
@@ -1,7 +1,7 @@
 #
 #  Input packet
 #
-User-Name = 'user@example.org'
+User-Name = 'user3@example.org'
 NAS-Port = 17826193
 NAS-IP-Address = 192.0.2.10
 Framed-IP-Address = 198.51.100.59
@@ -10,8 +10,8 @@ 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-Session-Id = '00000003'
+Acct-Unique-Session-Id = '00000003'
 Acct-Authentic = RADIUS
 Acct-Session-Time = 0
 Acct-Input-Packets = 0

diff --git a/src/tests/modules/sql/acct_start_conflict.unlang b/src/tests/modules/sql/acct_start_conflict.unlang
index 36db8cc71ccc5de69f16569ad1e936e998f63888..65e69e02b9e71f3c840e42d61ee3e5183612a9c3 100644 (file)
--- a/src/tests/modules/sql/acct_start_conflict.unlang
+++ b/src/tests/modules/sql/acct_start_conflict.unlang
@@ -6,7 +6,7 @@
 #  Clear out old data
 #
 update {
-       Tmp-String-0 := "%{sql:DELETE FROM radacct WHERE AcctSessionId = '00000001'}"
+       Tmp-String-0 := "%{sql:DELETE FROM radacct WHERE AcctSessionId = '00000003'}"
 }
 if (!&Tmp-String-0) {
        test_fail
@@ -30,7 +30,7 @@ else {
 #  Check the database has at least one row
 #
 update {
-       Tmp-Integer-0 := "%{sql:SELECT count(*) FROM radacct WHERE AcctSessionId = '00000001'}"
+       Tmp-Integer-0 := "%{sql:SELECT count(*) FROM radacct WHERE AcctSessionId = '00000003'}"
 }
 if (!&Tmp-Integer-0 || (&Tmp-Integer-0 != 1)) {
        test_fail
@@ -43,7 +43,7 @@ else {
 #  Check acctsessiontime matches the value in the request
 #
 update {
-       Tmp-Integer-0 := "%{sql:SELECT acctsessiontime FROM radacct WHERE AcctSessionId = '00000001'}"
+       Tmp-Integer-0 := "%{sql:SELECT acctsessiontime FROM radacct WHERE AcctSessionId = '00000003'}"
 }
 if (!&Tmp-Integer-0 || (&Tmp-Integer-0 != 0)) {
        test_fail
@@ -66,7 +66,7 @@ else {
        test_fail
 }
 update {
-       Tmp-String-0 := "%{sql:SELECT connectinfo_start FROM radacct WHERE AcctSessionId = '00000001'}"
+       Tmp-String-0 := "%{sql:SELECT connectinfo_start FROM radacct WHERE AcctSessionId = '00000003'}"
 }
 if (!&Tmp-Integer-0 || (&Tmp-String-0 != 'updated')) {
        test_fail

diff --git a/src/tests/modules/sql/acct_update_no_start.attrs b/src/tests/modules/sql/acct_update_no_start.attrs
index 23f46cd725059aa4bda415cfc9b69bbe8dead6f0..6f3049e91922e47a1dbe821a2ca5d30cbbf7a963 100644 (file)
--- a/src/tests/modules/sql/acct_update_no_start.attrs
+++ b/src/tests/modules/sql/acct_update_no_start.attrs
@@ -1,7 +1,7 @@
 #
 #  Input packet
 #
-User-Name = 'user@example.org'
+User-Name = 'user4@example.org'
 NAS-Port = 17826193
 NAS-IP-Address = 192.0.2.10
 Framed-IP-Address = 198.51.100.59
@@ -10,8 +10,8 @@ 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-Session-Id = '00000004'
+Acct-Unique-Session-Id = '00000004'
 Acct-Authentic = RADIUS
 Acct-Session-Time = 30
 Acct-Input-Packets = 10

diff --git a/src/tests/modules/sql/acct_update_no_start.unlang b/src/tests/modules/sql/acct_update_no_start.unlang
index 7ff75ce6eacd3d3fe6c395232e01e09dc1ce60e6..3875b2dc8f03af651287874937b4ab0b04537b7c 100644 (file)
--- a/src/tests/modules/sql/acct_update_no_start.unlang
+++ b/src/tests/modules/sql/acct_update_no_start.unlang
@@ -2,7 +2,7 @@
 #  Clear out old data
 #
 update {
-       Tmp-String-0 := "%{sql:DELETE FROM radacct WHERE AcctSessionId = '00000002'}"
+       Tmp-String-0 := "%{sql:DELETE FROM radacct WHERE AcctSessionId = '00000004'}"
 }
 if (!&Tmp-String-0) {
        test_fail
@@ -20,7 +20,7 @@ else {
 }
 
 update {
-       Tmp-Integer-0 := "%{sql:SELECT count(*) FROM radacct WHERE AcctSessionId = '00000002'}"
+       Tmp-Integer-0 := "%{sql:SELECT count(*) FROM radacct WHERE AcctSessionId = '00000004'}"
 }
 if (!&Tmp-Integer-0 || (&Tmp-Integer-0 != 1)) {
        test_fail
@@ -30,7 +30,7 @@ else {
 }
 
 update {
-       Tmp-Integer-0 := "%{sql:SELECT acctsessiontime FROM radacct WHERE AcctSessionId = '00000002'}"
+       Tmp-Integer-0 := "%{sql:SELECT acctsessiontime FROM radacct WHERE AcctSessionId = '00000004'}"
 }
 if (!&Tmp-Integer-0 || (&Tmp-Integer-0 != 30)) {
        test_fail

diff --git a/src/tests/modules/sql/auth.attrs b/src/tests/modules/sql/auth.attrs
index 73fb40ede00c20211ec6ae55c982ebefe2e1b434..e7d1498c41a0b9ef29ae7a3e81d97ec84c7f4fdb 100644 (file)
--- a/src/tests/modules/sql/auth.attrs
+++ b/src/tests/modules/sql/auth.attrs
@@ -1,7 +1,7 @@
 #
 #  Input packet
 #
-User-Name = "foo"
+User-Name = "user_auth"
 User-Password = "password"
 NAS-IP-Address = "1.2.3.4"
 

diff --git a/src/tests/modules/sql/auth.unlang b/src/tests/modules/sql/auth.unlang
index 141e194ae15ae04cf8e3b92059110fff924eda91..0d76538f7d1eff2b4e6600c34616b41d10ffb51e 100644 (file)
--- a/src/tests/modules/sql/auth.unlang
+++ b/src/tests/modules/sql/auth.unlang
@@ -2,35 +2,35 @@
 #  Clear out old data
 #
 update {
-       Tmp-String-0 := "%{sql:DELETE FROM radcheck WHERE username = 'foo'}"
+       Tmp-String-0 := "%{sql:DELETE FROM radcheck WHERE username = 'user_auth'}"
 }
 if (!&Tmp-String-0) {
        test_fail
 }
 
 update {
-       Tmp-String-0 := "%{sql:INSERT INTO radcheck (username, attribute, op, value) VALUES ('foo', 'NAS-IP-Address', '==', '1.2.3.4')}"
+       Tmp-String-0 := "%{sql:INSERT INTO radcheck (username, attribute, op, value) VALUES ('user_auth', 'NAS-IP-Address', '==', '1.2.3.4')}"
 }
 if (!&Tmp-String-0) {
        test_fail
 }
 
 update {
-       Tmp-String-0 := "%{sql:INSERT INTO radcheck (username, attribute, op, value) VALUES ('foo', 'Cleartext-Password', ':=', 'password')}"
+       Tmp-String-0 := "%{sql:INSERT INTO radcheck (username, attribute, op, value) VALUES ('user_auth', 'Cleartext-Password', ':=', 'password')}"
 }
 if (!&Tmp-String-0) {
        test_fail
 }
 
 update {
-       Tmp-String-0 := "%{sql:DELETE FROM radreply WHERE username = 'foo'}"
+       Tmp-String-0 := "%{sql:DELETE FROM radreply WHERE username = 'user_auth'}"
 }
 if (!&Tmp-String-0) {
        test_fail
 }
 
 update {
-       Tmp-String-0 := "%{sql:INSERT INTO radreply (username, attribute, op, value) VALUES ('foo', 'Idle-Timeout', ':=', '3600')}"
+       Tmp-String-0 := "%{sql:INSERT INTO radreply (username, attribute, op, value) VALUES ('user_auth', 'Idle-Timeout', ':=', '3600')}"
 }
 if (!&Tmp-String-0) {
        test_fail

diff --git a/src/tests/modules/sql/reject.attrs b/src/tests/modules/sql/reject.attrs
index dee0543bd0decc9c438e2e28f6f2d038b790e01e..cb0b9a234964fe0e9a656532a53c5e653a4539e7 100644 (file)
--- a/src/tests/modules/sql/reject.attrs
+++ b/src/tests/modules/sql/reject.attrs
@@ -1,7 +1,7 @@
 #
 #  Input packet
 #
-User-Name = "foo"
+User-Name = "user_reject"
 User-Password = "password"
 NAS-IP-Address = "1.2.3.4"
 

diff --git a/src/tests/modules/sql/reject.unlang b/src/tests/modules/sql/reject.unlang
index 22ef221df1b5c611b9610d1b17ecdf7bd269c742..b4afb095bce4f368a5997404a311ea1761cd2c8e 100644 (file)
--- a/src/tests/modules/sql/reject.unlang
+++ b/src/tests/modules/sql/reject.unlang
@@ -2,35 +2,35 @@
 #  Clear out old data
 #
 update {
-       Tmp-String-0 := "%{sql:DELETE FROM radcheck WHERE username = 'foo'}"
+       Tmp-String-0 := "%{sql:DELETE FROM radcheck WHERE username = 'user_reject'}"
 }
 if (!&Tmp-String-0) {
        test_fail
 }
 
 update {
-       Tmp-String-0 := "%{sql:INSERT INTO radcheck (username, attribute, op, value) VALUES ('foo', 'NAS-IP-Address', '==', '1.2.3.4')}"
+       Tmp-String-0 := "%{sql:INSERT INTO radcheck (username, attribute, op, value) VALUES ('user_reject', 'NAS-IP-Address', '==', '1.2.3.4')}"
 }
 if (!&Tmp-String-0) {
        test_fail
 }
 
 update {
-       Tmp-String-0 := "%{sql:INSERT INTO radcheck (username, attribute, op, value) VALUES ('foo', 'Cleartext-Password', ':=', 'wrong-password')}"
+       Tmp-String-0 := "%{sql:INSERT INTO radcheck (username, attribute, op, value) VALUES ('user_reject', 'Cleartext-Password', ':=', 'wrong-password')}"
 }
 if (!&Tmp-String-0) {
        test_fail
 }
 
 update {
-       Tmp-String-0 := "%{sql:DELETE FROM radreply WHERE username = 'foo'}"
+       Tmp-String-0 := "%{sql:DELETE FROM radreply WHERE username = 'user_reject'}"
 }
 if (!&Tmp-String-0) {
        test_fail
 }
 
 update {
-       Tmp-String-0 := "%{sql:INSERT INTO radreply (username, attribute, op, value) VALUES ('foo', 'Reply-Message', ':=', 'Authentication failed')}"
+       Tmp-String-0 := "%{sql:INSERT INTO radreply (username, attribute, op, value) VALUES ('user_reject', 'Reply-Message', ':=', 'Authentication failed')}"
 }
 if (!&Tmp-String-0) {
        test_fail