Commit 10ec9b22 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge pull request #2017 from duksis/backup_restore

bugfix: backup data retrieved with the same type keys as saved
parents c19e766f a9c2500a
...@@ -82,7 +82,7 @@ namespace :gitlab do ...@@ -82,7 +82,7 @@ namespace :gitlab do
end end
settings = YAML.load_file("backup_information.yml") settings = YAML.load_file("backup_information.yml")
ENV["VERSION"] = "#{settings["db_version"]}" if settings["db_version"].to_i > 0 ENV["VERSION"] = "#{settings[:db_version]}" if settings[:db_version].to_i > 0
# restoring mismatching backups can lead to unexpected problems # restoring mismatching backups can lead to unexpected problems
if settings[:gitlab_version] != %x{git rev-parse HEAD}.gsub(/\n/,"") if settings[:gitlab_version] != %x{git rev-parse HEAD}.gsub(/\n/,"")
......
require 'spec_helper'
require 'rake'
describe 'gitlab:app namespace rake task' do
before :all do
Rake.application.rake_require "tasks/gitlab/backup"
# empty task as env is already loaded
Rake::Task.define_task :environment
end
describe 'backup_restore' do
before do
# avoid writing task output to spec progress
$stdout.stub :write
end
let :run_rake_task do
Rake::Task["gitlab:app:backup_restore"].reenable
Rake.application.invoke_task "gitlab:app:backup_restore"
end
context 'gitlab version' do
before do
Dir.stub :glob => []
Dir.stub :chdir
File.stub :exists? => true
Kernel.stub :system => true
end
let(:gitlab_version) { %x{git rev-parse HEAD}.gsub(/\n/,"") }
it 'should fail on mismach' do
YAML.stub :load_file => {:gitlab_version => gitlab_version.reverse}
expect { run_rake_task }.to raise_error SystemExit
end
it 'should invoke restoration on mach' do
YAML.stub :load_file => {:gitlab_version => gitlab_version}
Rake::Task["gitlab:app:db_restore"].should_receive :invoke
Rake::Task["gitlab:app:repo_restore"].should_receive :invoke
expect { run_rake_task }.to_not raise_error SystemExit
end
end
end # backup_restore task
end # gitlab:app namespace
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment