Skip to content

SubscriptionManager.registered? returns true for RHN #68

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
merged 2 commits into from
Oct 3, 2013
Merged

SubscriptionManager.registered? returns true for RHN #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0294e79
Enhance test to reproduce .registered?
bdunne Oct 3, 2013
d79f294
Check if registered to RHN first to avoid false positives on SM
bdunne Oct 3, 2013
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
6 changes: 3 additions & 3 deletions lib/linux_admin/registration_system.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ def registered?
private

def self.registration_type_uncached
if SubscriptionManager.new.registered?
SubscriptionManager
elsif Rhn.new.registered?
if Rhn.new.registered?
Rhn
elsif SubscriptionManager.new.registered?
SubscriptionManager
else
self
end
Expand Down
8 changes: 4 additions & 4 deletions spec/registration_system_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
end

it "when registered RHN" do
stub_registered_to_system(:rhn)
stub_registered_to_system(:sm, :rhn)
expect(described_class.registration_type).to eq(LinuxAdmin::Rhn)
end

Expand Down Expand Up @@ -53,8 +53,8 @@
end
end

def stub_registered_to_system(system)
LinuxAdmin::SubscriptionManager.any_instance.stub(:registered? => (system == :sm))
LinuxAdmin::Rhn.any_instance.stub(:registered? => data_file_path("rhn/systemid")) if system == :rhn
def stub_registered_to_system(*system)
LinuxAdmin::SubscriptionManager.any_instance.stub(:registered? => (system.include?(:sm)))
LinuxAdmin::Rhn.any_instance.stub(:registered? => (system.include?(:rhn)))
end
end