fdo-mirrors/wireplumber
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/wireplumber.git synced 2025-12-25 07:50:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

tests/scripts: fix tests to respect "object.serial" vs "node.id" differences

Browse source 
Fixes: #761
This commit is contained in:
George Kiagiadakis 2025-02-07 08:54:05 +02:00
parent 48a415bc8f
commit 14cbddd007
11 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/scripts/scripts/04-test-linking-defined-device-node-target-object-string.lua
View file

@ -29,7 +29,7 @@ SimpleEventHook {
local name = lnkbl.properties ["node.name"]
if tu.linkablesReady () and name ~= "stream-node" then
local props = {
["target.object"] = tu.lnkbls ["defined-device-node"].properties ["node.id"]
["target.object"] = tu.lnkbls ["defined-device-node"].properties ["object.serial"]
}
tu.createStreamNode ("playback", props)
end

2
tests/scripts/scripts/05-test-linking-defined-device-node-target-object-int.lua
View file

@ -29,7 +29,7 @@ SimpleEventHook {
local name = lnkbl.properties ["node.name"]
if tu.linkablesReady () and name ~= "stream-node" then
local props = {
["target.object"] = tonumber (tu.lnkbls ["defined-device-node"].properties ["node.id"]),
["target.object"] = tonumber (tu.lnkbls ["defined-device-node"].properties ["object.serial"]),
}
tu.createStreamNode ("playback", props)
end

2
tests/scripts/scripts/07-test-linking-defined-device-node-target-object-string-capture.lua
View file

@ -29,7 +29,7 @@ SimpleEventHook {
local name = lnkbl.properties ["node.name"]
if tu.linkablesReady () and name ~= "stream-node" then
local props = {
["target.object"] = tu.lnkbls ["defined-device-node"].properties ["node.id"]
["target.object"] = tu.lnkbls ["defined-device-node"].properties ["object.serial"]
}
tu.createStreamNode ("capture", props)
end

2
tests/scripts/scripts/08-test-linking-defined-device-node-target-object-int-capture.lua
View file

@ -29,7 +29,7 @@ SimpleEventHook {
local name = lnkbl.properties ["node.name"]
if tu.linkablesReady () and name ~= "stream-node" then
local props = {
["target.object"] = tonumber (tu.lnkbls ["defined-device-node"].properties ["node.id"]),
["target.object"] = tonumber (tu.lnkbls ["defined-device-node"].properties ["object.serial"]),
}
tu.createStreamNode ("capture", props)
end

4
tests/scripts/scripts/12-test-linking-defined-device-node-target-node-metadata.lua
View file

@ -33,7 +33,7 @@ SimpleEventHook {
tu.createStreamNode ("playback")
elseif tu.linkablesReady () and tu.lnkbls ["stream-node"] then
-- when "stream-node" linkable is ready
tu.setTargetInMetadata ("target.node", "defined-device-node")
tu.setTargetInMetadata ("target.node", "defined-device-node", "node.id")
end
end
}:register ()
@ -52,7 +52,7 @@ SimpleEventHook {
},
execute = function (event)
if tu.linkablesReady () then
tu.setTargetInMetadata ("target.node", "defined-device-node")
tu.setTargetInMetadata ("target.node", "defined-device-node", "node.id")
end
end
}:register ()

2
tests/scripts/scripts/13-test-linking-defined-device-node-target-node-metadata-capture.lua
View file

@ -33,7 +33,7 @@ SimpleEventHook {
tu.createStreamNode ("capture")
elseif tu.linkablesReady () and tu.lnkbls ["stream-node"] then
-- when "stream-node" linkable is ready
tu.setTargetInMetadata ("target.node", "defined-device-node")
tu.setTargetInMetadata ("target.node", "defined-device-node", "node.id")
end
end
}:register ()

2
tests/scripts/scripts/14-test-linking-defined-device-node-target-object-metadata.lua
View file

@ -33,7 +33,7 @@ SimpleEventHook {
tu.createStreamNode ("playback")
elseif tu.linkablesReady () and tu.lnkbls ["stream-node"] then
-- when "stream-node" linkable is ready
tu.setTargetInMetadata ("target.object", "defined-device-node")
tu.setTargetInMetadata ("target.object", "defined-device-node", "object.serial")
end
end
}:register ()

2
tests/scripts/scripts/15-test-linking-defined-device-node-target-object-metadata-capture.lua
View file

@ -33,7 +33,7 @@ SimpleEventHook {
tu.createStreamNode ("capture")
elseif tu.linkablesReady () and tu.lnkbls ["stream-node"] then
-- when "stream-node" linkable is ready
tu.setTargetInMetadata ("target.object", "defined-device-node")
tu.setTargetInMetadata ("target.object", "defined-device-node", "object.serial")
end
end
}:register ()

4
tests/scripts/scripts/16-test-linking-defined-device-node-target-object-int-metadata.lua
View file

@ -32,12 +32,12 @@ SimpleEventHook {
if tu.linkablesReady () and name ~= "stream-node" then
-- all linkables created except stream-node
local props = {
["target.object"] = tu.lnkbls ["defined-device-node-in-props"].properties ["node.id"]
["target.object"] = tu.lnkbls ["defined-device-node-in-props"].properties ["object.serial"]
}
tu.createStreamNode ("playback", props)
elseif tu.linkablesReady () and tu.lnkbls ["stream-node"] then
-- when "stream-node" linkable is ready
tu.setTargetInMetadata ("target.object", "defined-device-node-in-metadata")
tu.setTargetInMetadata ("target.object", "defined-device-node-in-metadata", "object.serial")
end
end
}:register ()

4
tests/scripts/scripts/17-test-linking-defined-device-node-target-object-int-metadata-capture.lua
View file

@ -32,12 +32,12 @@ SimpleEventHook {
if tu.linkablesReady () and name ~= "stream-node" then
-- all linkables created except stream-node
local props = {
["target.object"] = tu.lnkbls ["defined-device-node-in-props"].properties ["node.id"]
["target.object"] = tu.lnkbls ["defined-device-node-in-props"].properties ["object.serial"]
}
tu.createStreamNode ("capture", props)
elseif tu.linkablesReady () and tu.lnkbls ["stream-node"] then
-- when "stream-node" linkable is ready
tu.setTargetInMetadata ("target.object", "defined-device-node-in-metadata")
tu.setTargetInMetadata ("target.object", "defined-device-node-in-metadata", "object.serial")
end
end
}:register ()

4
tests/scripts/scripts/lib/test-utils.lua
View file

@ -97,9 +97,9 @@ u.settings_metadata = cu.get_object_manager ("metadata"):lookup {
assert (u.settings_metadata ~= nil)
-- update the defined target for stream session item in metadata.
function u.setTargetInMetadata (prop, target_node_name)
function u.setTargetInMetadata (prop, target_node_name, target_property)
u.default_metadata:set (u.lnkbls ["stream-node"].properties ["node.id"], prop,
"Spa:Id", u.lnkbls [target_node_name].properties ["node.id"])
"Spa:Id", u.lnkbls [target_node_name].properties [target_property])
end
function u.linkablesReady ()