Skip to content

[Apple] nodeobs_settings test fix #1652

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sandboxcoder merged 1 commit into from
Mar 27, 2026
Merged

[Apple] nodeobs_settings test fix #1652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions obs-studio-server/source/osn-input.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,10 @@ void osn::Input::FromName(void *data, const int64_t id, const std::vector<ipc::v
{
obs_source_t *source = obs_get_source_by_name(args[0].value_str.c_str());
if (!source) {
PRETTY_ERROR_RETURN(ErrorCode::NotFound, "Named input could not be found.");
std::string missing_name(args[0].value_str);
std::stringstream ss;
ss << "Named input (" << missing_name << ") could not be found.";
PRETTY_ERROR_RETURN(ErrorCode::NotFound, ss.str().c_str());
}

uint64_t uid = osn::Source::Manager::GetInstance().find(source);
Expand Down Expand Up @@ -666,4 +669,4 @@ void osn::Input::GetMediaState(void *data, const int64_t id, const std::vector<i
rval.push_back(ipc::value((uint64_t)ErrorCode::Ok));
rval.push_back(ipc::value(obs_source_media_get_state(input)));
AUTO_DEBUG;
}
}
12 changes: 7 additions & 5 deletions tests/osn-tests/src/test_nodeobs_settings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,8 @@ describe(testName, function() {
obs.setSetting(EOBSSettingsCategories.Output, 'Mode', 'Simple');
obs.setSetting(EOBSSettingsCategories.Output, 'RecQuality', 'Stream');
obs.setSetting(EOBSSettingsCategories.Output, 'RecRB', true);
// Use correct SIMPLE_ENCODER_X264 value based on OS since obs_x264 is used for macOS while x264 is used for Windows
const streamEncoder = (obs.os === 'win32' ? 'x264' : 'obs_x264');

// Getting simple output settings container with same as stream and replay buffer settings
let sameAsStreamRBuffOutputSettings = obs.getSettingsContainer(EOBSSettingsCategories.Output);
Expand All @@ -138,7 +140,7 @@ describe(testName, function() {
break;
}
case 'StreamEncoder': {
parameter.currentValue = 'x264';
parameter.currentValue = streamEncoder;
break;
}
case 'ABitrate': {
Expand Down Expand Up @@ -201,7 +203,7 @@ describe(testName, function() {
break;
}
case 'StreamEncoder': {
expect(parameter.currentValue).to.equal('x264', GetErrorMessage(ETestErrorMsg.SingleOutputSetting, parameter.name));
expect(parameter.currentValue).to.equal(streamEncoder, GetErrorMessage(ETestErrorMsg.SingleOutputSetting, parameter.name));
break;
}
case 'ABitrate': {
Expand Down Expand Up @@ -256,7 +258,7 @@ describe(testName, function() {
break;
}
case 'StreamEncoder': {
expect(parameter.currentValue).to.equal('x264', GetErrorMessage(ETestErrorMsg.SingleOutputSetting, parameter.name));
expect(parameter.currentValue).to.equal(streamEncoder, GetErrorMessage(ETestErrorMsg.SingleOutputSetting, parameter.name));
break;
}
case 'ABitrate': {
Expand All @@ -277,7 +279,7 @@ describe(testName, function() {
break;
}
case 'RecEncoder': {
expect(parameter.currentValue).to.equal('x264', GetErrorMessage(ETestErrorMsg.SingleOutputSetting, parameter.name));
expect(parameter.currentValue).to.equal(streamEncoder, GetErrorMessage(ETestErrorMsg.SingleOutputSetting, parameter.name));
break;
}
}
Expand Down Expand Up @@ -311,7 +313,7 @@ describe(testName, function() {
break;
}
case 'StreamEncoder': {
expect(parameter.currentValue).to.equal('x264', GetErrorMessage(ETestErrorMsg.SingleOutputSetting, parameter.name));
expect(parameter.currentValue).to.equal(streamEncoder, GetErrorMessage(ETestErrorMsg.SingleOutputSetting, parameter.name));
break;
}
case 'ABitrate': {
Expand Down
Loading