Move Wimax tests to the new framework

diff --git a/src/tests/Makefile b/src/tests/Makefile
index 5558d6d..3a2d1f1 100644 (file)
--- a/src/tests/Makefile
+++ b/src/tests/Makefile
@@ -19,7 +19,7 @@ export DYLD_LIBRARY_PATH
 RADDB_PATH := $(top_builddir)/raddb
 
 TESTS  = vpiter mschapv1 digest-01/digest* \
-       test.example.com wimax
+       test.example.com 
 
 PORT    = 12340
 #PORT   = 1812

diff --git a/src/tests/auth/all.mk b/src/tests/auth/all.mk
index 3017a19..441f4fb 100644 (file)
--- a/src/tests/auth/all.mk
+++ b/src/tests/auth/all.mk
@@ -50,7 +50,7 @@ $(BUILD_DIR)/tests/auth/%.attrs: $(DIR)/%.attrs | $(BUILD_DIR)/tests/auth
 #  Don't auto-remove the files copied by the rule just above.
 #  It's unnecessary, and it clutters the output with crap.
 #
-.PRECIOUS: $(BUILD_DIR)/tests/auth/%.attrs
+.PRECIOUS: $(BUILD_DIR)/tests/auth/%.attrs raddb/mods-enabled/wimax
 
 AUTH_MODULES   := $(shell grep -- mods-enabled src/tests/auth/radiusd.conf  | sed 's,.*/,,')
 AUTH_RADDB     := $(addprefix raddb/mods-enabled/,$(AUTH_MODULES))

diff --git a/src/tests/auth/wimax b/src/tests/auth/wimax
new file mode 100644 (file)
index 0000000..648546a
--- /dev/null
+++ b/src/tests/auth/wimax
@@ -0,0 +1,3 @@
+#
+#  Password is already set in radiusd.conf
+#

diff --git a/src/tests/wimax b/src/tests/auth/wimax.attrs
similarity index 93%
rename from src/tests/wimax
rename to src/tests/auth/wimax.attrs
index 1b1a1e7..38ec09a 100644 (file)
--- a/src/tests/wimax
+++ b/src/tests/auth/wimax.attrs
@@ -4,7 +4,7 @@
 #      TESTS 1
 #
 User-Name = "bob"
-User-Password = "bob"
+User-Password = "hello"
 WiMAX-GMT-Timezone-offset = -1
 WiMAX-AAA-Session-Id = 0x01020304
 WiMAX-hHA-IP-MIP4 = 192.0.2.1
@@ -24,3 +24,7 @@ WiMAX-Packet-Data-Flow-Id = 1
 WiMAX-Hotline-Indicator = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxaaaaaaaaaabbbbbbbbbbcccccccccc123"
 WiMAX-Service-Data-Flow-Id = 2
 WiMAX-hHA-IP-MIP4 = 192.0.2.2
+
+
+# and the response
+Response-Packet-Type == Access-Accept