From 93c90c514a73f8a7d4de8d318476ec7641063935 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Sun, 10 Jan 2016 03:25:16 +0100
Subject: tests: Correct mistake from latst merge, use the same variable name
 in all 3 places where it matters

---
 tests/test.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tests')

diff --git a/tests/test.lua b/tests/test.lua
index 1192b7b8..87467e53 100644
--- a/tests/test.lua
+++ b/tests/test.lua
@@ -145,10 +145,10 @@ function dotest(unitname)
 		unit._M = unit;
 	end
 	setfenv(chunk, unit);
-	local success, err = pcall(chunk);
+	local success, ret = pcall(chunk);
 	_fakeG.module, _fakeG._M = oldmodule, old_M;
 	if not success then
-		print("WARNING: ", "Failed to initialise module: "..unitname, err);
+		print("WARNING: ", "Failed to initialise module: "..unitname, ret);
 		return;
 	end
 
-- 
cgit v1.2.3


From 0d98ccd02a37153aef1cbfb71ba9c103d43fbda7 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Sun, 10 Jan 2016 03:35:00 +0100
Subject: tests: Add test for util.uuid (checks that the output format is
 correct)

---
 tests/test.lua           |  1 +
 tests/test_util_uuid.lua | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 tests/test_util_uuid.lua

(limited to 'tests')

diff --git a/tests/test.lua b/tests/test.lua
index 87467e53..4f6c5335 100644
--- a/tests/test.lua
+++ b/tests/test.lua
@@ -22,6 +22,7 @@ function run_all_tests()
 	dotest "util.sasl.scram"
 	dotest "util.cache"
 	dotest "util.throttle"
+	dotest "util.uuid"
 
 	dosingletest("test_sasl.lua", "latin1toutf8");
 	dosingletest("test_utf8.lua", "valid");
diff --git a/tests/test_util_uuid.lua b/tests/test_util_uuid.lua
new file mode 100644
index 00000000..d3f72bb4
--- /dev/null
+++ b/tests/test_util_uuid.lua
@@ -0,0 +1,24 @@
+-- This tests the format, not the randomness
+
+-- https://tools.ietf.org/html/rfc4122#section-4.4
+
+local pattern = "^" .. table.concat({
+	string.rep("%x", 8),
+	string.rep("%x", 4),
+	"4" .. -- version
+	string.rep("%x", 3),
+	"[89ab]" .. -- reserved bits of 1 and 0
+	string.rep("%x", 3),
+	string.rep("%x", 12),
+}, "%-") .. "$";
+
+function generate(generate)
+	for i = 1, 100 do
+		assert_is(generate():match(pattern));
+	end
+end
+
+function seed(seed)
+	assert_equal(seed("random string here"), nil, "seed doesn't return anything");
+end
+
-- 
cgit v1.2.3