Skip to content

fix: replace facet's constant by const_get #570

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

Open
doudou wants to merge 1 commit into
base: transition-to-runkit
Choose a base branch
from
+6 −4
Open

fix: replace facet's constant by const_get #570

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
2 changes: 1 addition & 1 deletion lib/syskit/actions/profile.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ def resolved_dependency_injection
end

def to_s
name
name || "<anonymous profile>"
end

# Promote requirements taken from another profile to this profile
Expand Down
2 changes: 1 addition & 1 deletion lib/syskit/droby/v5/droby_dump.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ def proxy(peer)

profile =
begin
constant(@name)
Object.const_get(@name)
rescue Exception
Actions::Profile.new(@name)
end
Expand Down
6 changes: 4 additions & 2 deletions test/droby/test_droby_dump.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,8 +187,10 @@ def proxy(_peer)
it "returns the constant" do
droby = droby_local_marshaller.dump(Actions::Profile.new("AProfile"))
droby = Marshal.load(Marshal.dump(droby))
flexmock(droby).should_receive(:constant).with("AProfile")
.and_return(profile = Actions::Profile.new)
profile = Syskit::Actions::Profile.new
flexmock(Object)
.should_receive(:const_get).with("AProfile")
.and_return(profile)
unmarshalled = droby_remote_marshaller.local_object(droby)
assert_same profile, unmarshalled
end
Expand Down