Skip to content

Commit

Permalink
The classes have been renamed
Browse files Browse the repository at this point in the history
  • Loading branch information
lslezak committed Sep 17, 2018
1 parent 2b56812 commit f467584
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions src/lib/installation/clients/inst_update_installer.rb
Expand Up @@ -15,7 +15,7 @@

require "installation/updates_manager"
require "installation/update_repositories_finder"
require "y2packager/selfupdate_addon_repo"
require "y2packager/self_update_addon_repo"
require "uri"
require "yaml"

Expand Down Expand Up @@ -521,7 +521,7 @@ def process_location
def copy_addon_packages
log.info("Copying optional addon packages from the self update repositories...")
updates_manager.repositories.each do |u|
::Y2Packager::SelfupdateAddonRepo.copy_packages(u.repo_id)
::Y2Packager::SelfUpdateAddonRepo.copy_packages(u.repo_id)
end
end
end
Expand Down
4 changes: 2 additions & 2 deletions src/lib/installation/update_repository.rb
Expand Up @@ -18,7 +18,7 @@

require "packages/package_downloader"
require "packages/package_extractor"
require "y2packager/selfupdate_addon_filter"
require "y2packager/self_update_addon_filter"

Yast.import "Pkg"
Yast.import "Progress"
Expand Down Expand Up @@ -153,7 +153,7 @@ def packages
@packages = candidates.select { |p| p["source"] == repo_id }.sort_by! { |a| a["name"] }
log.info "Found #{@packages.size} packages: #{@packages}"
# remove packages which are used as addons, these should not be applied to the inst-sys
addon_pkgs = Y2Packager::SelfupdateAddonFilter.packages(repo_id)
addon_pkgs = Y2Packager::SelfUpdateAddonFilter.packages(repo_id)
@packages.reject! { |p| addon_pkgs.include?(p["name"]) }
log.info "Using #{@packages.size} packages: #{@packages}"
@packages
Expand Down
6 changes: 3 additions & 3 deletions test/inst_update_installer_test.rb
Expand Up @@ -45,7 +45,7 @@
allow(subject).to receive(:require).with("registration/url_helpers").and_raise(LoadError)
stub_const("Registration::Storage::InstallationOptions", FakeInstallationOptions)
stub_const("Registration::Storage::Config", FakeRegConfig)
allow(Y2Packager::SelfupdateAddonRepo).to receive(:copy_packages)
allow(Y2Packager::SelfUpdateAddonRepo).to receive(:copy_packages)

# skip the libzypp initialization globally, enable in the specific tests
allow(subject).to receive(:initialize_packager).and_return(true)
Expand Down Expand Up @@ -118,15 +118,15 @@
allow(subject).to receive(:add_repository).and_return(true)
allow(manager).to receive(:apply_all)
allow(::FileUtils).to receive(:touch)
allow(Y2Packager::SelfupdateAddonRepo).to receive(:copy_packages)
allow(Y2Packager::SelfUpdateAddonRepo).to receive(:copy_packages)
end

it "creates update file and returns :restart_yast" do
expect(subject.main).to eq(:restart_yast)
end

it "copies the add-on packages from the self-update repository" do
expect(Y2Packager::SelfupdateAddonRepo).to receive(:copy_packages)
expect(Y2Packager::SelfUpdateAddonRepo).to receive(:copy_packages)
.with(repo.repo_id)
subject.main
end
Expand Down

0 comments on commit f467584

Please sign in to comment.