summaryrefslogtreecommitdiff
path: root/spec/tasks
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-03-16 23:51:46 -0700
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-03-16 23:51:46 -0700
commit3a324d9c6d52b7605e8b701ac70eddc2528b408b (patch)
tree758ccd472948a2e7202a4271436c327b4e3cd9d8 /spec/tasks
parent84edc020b2107252a383ce73ca41924b8be9ddad (diff)
downloadgitlab-ce-3a324d9c6d52b7605e8b701ac70eddc2528b408b.tar.gz
Revert "Merge branch 'backup-permissions' into 'master'"
This reverts commit c42262b43b009af990e5769840391862d64a1c2d, reversing changes made to c6586b1283a94c8f08bc669f4d8a9384b263073e.
Diffstat (limited to 'spec/tasks')
-rw-r--r--spec/tasks/gitlab/backup_rake_spec.rb50
1 files changed, 7 insertions, 43 deletions
diff --git a/spec/tasks/gitlab/backup_rake_spec.rb b/spec/tasks/gitlab/backup_rake_spec.rb
index e6763be7b8f..60942cc95fc 100644
--- a/spec/tasks/gitlab/backup_rake_spec.rb
+++ b/spec/tasks/gitlab/backup_rake_spec.rb
@@ -10,17 +10,17 @@ describe 'gitlab:app namespace rake task' do
Rake::Task.define_task :environment
end
- def run_rake_task(task_name)
- Rake::Task[task_name].reenable
- Rake.application.invoke_task task_name
- end
-
describe 'backup_restore' do
before do
# avoid writing task output to spec progress
allow($stdout).to receive :write
end
+ let :run_rake_task do
+ Rake::Task["gitlab:backup:restore"].reenable
+ Rake.application.invoke_task "gitlab:backup:restore"
+ end
+
context 'gitlab version' do
before do
Dir.stub glob: []
@@ -36,9 +36,7 @@ describe 'gitlab:app namespace rake task' do
it 'should fail on mismatch' do
YAML.stub load_file: {gitlab_version: "not #{gitlab_version}" }
- expect { run_rake_task('gitlab:backup:restore') }.to(
- raise_error SystemExit
- )
+ expect { run_rake_task }.to raise_error SystemExit
end
it 'should invoke restoration on mach' do
@@ -46,43 +44,9 @@ describe 'gitlab:app namespace rake task' do
expect(Rake::Task["gitlab:backup:db:restore"]).to receive :invoke
expect(Rake::Task["gitlab:backup:repo:restore"]).to receive :invoke
expect(Rake::Task["gitlab:shell:setup"]).to receive :invoke
- expect { run_rake_task('gitlab:backup:restore') }.to_not raise_error
+ expect { run_rake_task }.to_not raise_error
end
end
end # backup_restore task
-
- describe 'backup_create' do
- def tars_glob
- Dir.glob(File.join(Gitlab.config.backup.path, '*_gitlab_backup.tar'))
- end
-
- before :all do
- FileUtils.rm(tars_glob)
- orig_stdout = $stdout
- $stdout = StringIO.new
- run_rake_task('gitlab:backup:create')
- $stdout = orig_stdout
-
- @backup_tar = tars_glob.first
- end
-
- before do
- backup_path = File.join(Gitlab.config.backup.path, 'test')
- allow(Gitlab.config.backup).to receive(:path).and_return(backup_path)
- end
-
- it 'should set correct permissions on the tar file' do
- expect(File.exist?(@backup_tar)).to be_truthy
- expect(File::Stat.new(@backup_tar).mode.to_s(8)).to eq('100600')
- end
-
- it 'should set correct permissions on the tar contents' do
- tar_contents, exit_status = Gitlab::Popen.popen(
- %W{tar -tvf #{@backup_tar} db uploads repositories}
- )
- expect(exit_status).to eq(0)
- expect(tar_contents).not_to match(/^.{4,9}[rwx]/)
- end
- end # backup_create task
end # gitlab:app namespace