From 9ad22b7c264c1d986323bfbf5dae8cef05673c72 Mon Sep 17 00:00:00 2001
From: Roman Tsisyk <roman@tsisyk.com>
Date: Sat, 17 Dec 2016 13:28:49 +0300
Subject: [PATCH] Fix failing box/session.storage.test.lua
Fixes #1849
---
test/box/session.storage.result | 25 ++++++++++++-------------
test/box/session.storage.test.lua | 13 +++++--------
2 files changed, 17 insertions(+), 21 deletions(-)
diff --git a/test/box/session.storage.result b/test/box/session.storage.result
index 548bbdb211..cbf7ad8d76 100644
--- a/test/box/session.storage.result
+++ b/test/box/session.storage.result
@@ -10,9 +10,6 @@ test_run = env.new('localhost')
session = box.session
---
...
-dump = function(data) return "'" .. require('json').encode(data) .. "'" end
----
-...
type(session.id())
---
- number
@@ -35,9 +32,9 @@ session.storage.abc
all = getmetatable(session).aggregate_storage
---
...
-dump(all)
+all[session.id()].abc
---
-- '''[null,{"abc":"cde"}]'''
+- cde
...
test_run:cmd("create connection second to default")
---
@@ -74,17 +71,17 @@ test_run:cmd("set connection second")
---
- true
...
-dump(all[session.id()])
+all[session.id()]
---
-- '''{"abc":"def"}'''
+- abc: def
...
test_run:cmd("set connection default")
---
- true
...
-dump(all[session.id()])
+all[session.id()]
---
-- '''{"abc":"cde"}'''
+- abc: cde
...
tres1 = {}
---
@@ -111,13 +108,15 @@ table.sort(tres1)
table.sort(tres2)
---
...
-dump(tres1)
+tres1
---
-- '''["cde","def"]'''
+- - cde
+ - def
...
-dump(tres2)
+tres2
---
-- '''["cde","def"]'''
+- - cde
+ - def
...
getmetatable(session).aggregate_storage = {}
---
diff --git a/test/box/session.storage.test.lua b/test/box/session.storage.test.lua
index 9d5becb84a..3497bde9e0 100644
--- a/test/box/session.storage.test.lua
+++ b/test/box/session.storage.test.lua
@@ -3,9 +3,6 @@ env = require('test_run')
test_run = env.new('localhost')
session = box.session
-dump = function(data) return "'" .. require('json').encode(data) .. "'" end
-
-
type(session.id())
session.unknown_field
@@ -14,7 +11,7 @@ session.storage.abc = 'cde'
session.storage.abc
all = getmetatable(session).aggregate_storage
-dump(all)
+all[session.id()].abc
test_run:cmd("create connection second to default")
test_run:cmd("set connection second")
@@ -29,10 +26,10 @@ test_run:cmd("set connection default")
session.storage.abc
test_run:cmd("set connection second")
-dump(all[session.id()])
+all[session.id()]
test_run:cmd("set connection default")
-dump(all[session.id()])
+all[session.id()]
tres1 = {}
tres2 = {}
for k,v in pairs(all) do table.insert(tres1, v.abc) end
@@ -43,8 +40,8 @@ for k,v in pairs(all) do table.insert(tres2, v.abc) end
table.sort(tres1)
table.sort(tres2)
-dump(tres1)
-dump(tres2)
+tres1
+tres2
getmetatable(session).aggregate_storage = {}
session = nil
--
GitLab