aboutsummaryrefslogtreecommitdiff
path: root/test/functional/core/log_spec.lua
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2022-06-01 11:28:14 -0700
committerJustin M. Keyes <justinkz@gmail.com>2022-06-15 19:29:51 -0700
commit1f2c2a35ad14cfac002d87073471bd84a52860bf (patch)
treed1830fbb6b8774249da3fbc2f9caae82aa044863 /test/functional/core/log_spec.lua
parentb6467dfc23dab476e256490b8014bbb488684e6b (diff)
downloadrneovim-1f2c2a35ad14cfac002d87073471bd84a52860bf.tar.gz
rneovim-1f2c2a35ad14cfac002d87073471bd84a52860bf.tar.bz2
rneovim-1f2c2a35ad14cfac002d87073471bd84a52860bf.zip
feat(server): instance "name", store pipes in stdpath(state)
Problem: - Unix sockets are created in random /tmp dirs. - /tmp is messy, unclear when OSes actually clear it. - The generated paths are very ugly. This adds friction to reasoning about which paths belong to which Nvim instances. - No way to provide a human-friendly way to identify Nvim instances in logs or server addresses. Solution: - Store unix sockets in stdpath('state') - Allow --listen "name" and serverstart("name") to given a name (which is appended to a generated path). TODO: - is stdpath(state) the right place?
Diffstat (limited to 'test/functional/core/log_spec.lua')
-rw-r--r--test/functional/core/log_spec.lua24
1 files changed, 13 insertions, 11 deletions
diff --git a/test/functional/core/log_spec.lua b/test/functional/core/log_spec.lua
index 8553197305..3b1ccd9559 100644
--- a/test/functional/core/log_spec.lua
+++ b/test/functional/core/log_spec.lua
@@ -1,18 +1,19 @@
local helpers = require('test.functional.helpers')(after_each)
local assert_log = helpers.assert_log
local clear = helpers.clear
+local command = helpers.command
local eq = helpers.eq
local exec_lua = helpers.exec_lua
+local expect_exit = helpers.expect_exit
local request = helpers.request
local retry = helpers.retry
-local expect_exit = helpers.expect_exit
describe('log', function()
- local test_log_file = 'Xtest_logging'
+ local testlog = 'Xtest_logging'
after_each(function()
- expect_exit('qa!')
- os.remove(test_log_file)
+ expect_exit(command, 'qa!')
+ os.remove(testlog)
end)
it('skipped before log_init', function()
@@ -33,13 +34,14 @@ describe('log', function()
-- ERR 2022-05-29T12:30:03.814 T2/child log_init:110: test log message
clear({env={
- NVIM_LOG_FILE=test_log_file,
- -- TODO: Can remove this after nvim_log #7062 is merged.
+ NVIM_LOG_FILE=testlog,
+ -- TODO: remove this after nvim_log #7062 is merged.
__NVIM_TEST_LOG='1'
}})
- retry(nil, nil, function()
- assert_log('T%d+\\.%d+\\.\\d +log_init:%d+: test log message', test_log_file, 100)
+ local tid = _G._nvim_test_id
+ retry(nil, 1000, function()
+ assert_log(tid..'%.%d+%.%d +server_init:%d+: test log message', testlog, 100)
end)
exec_lua([[
@@ -47,9 +49,9 @@ describe('log', function()
vim.fn.jobwait({ j1 }, 10000)
]])
- -- Child Nvim spawned by jobstart() appends "/child" to parent name.
- retry(nil, nil, function()
- assert_log('T%d+/child +log_init:%d+: test log message', test_log_file, 100)
+ -- Child Nvim spawned by jobstart() appends "/c" to parent name.
+ retry(nil, 1000, function()
+ assert_log('%.%d+%.%d/c +server_init:%d+: test log message', testlog, 100)
end)
end)
end)