BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
2f2b9f67
Commit
2f2b9f67
authored
Sep 16, 2015
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix backup tests
parent
416d98b4
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
4 deletions
+5
-4
manager.rb
lib/backup/manager.rb
+1
-1
setup_builds_storage.rb
spec/support/setup_builds_storage.rb
+2
-1
backup_rake_spec.rb
spec/tasks/gitlab/backup_rake_spec.rb
+2
-2
No files found.
lib/backup/manager.rb
View file @
2f2b9f67
...
...
@@ -153,7 +153,7 @@ module Backup
end
def
folders_to_backup
folders
=
%w{repositories db uploads}
folders
=
%w{repositories db uploads
builds
}
if
ENV
[
"SKIP"
]
return
folders
.
reject
{
|
folder
|
ENV
[
"SKIP"
].
include?
(
folder
)
}
...
...
spec/support/setup_builds_storage.rb
View file @
2f2b9f67
RSpec
.
configure
do
|
config
|
def
builds_path
Rails
.
root
.
join
(
'tmp/builds
_test
'
)
Rails
.
root
.
join
(
'tmp/builds'
)
end
config
.
before
(
:each
)
do
FileUtils
.
mkdir_p
(
builds_path
)
FileUtils
.
touch
(
File
.
join
(
builds_path
,
".gitkeep"
))
Settings
.
gitlab_ci
[
'builds_path'
]
=
builds_path
end
...
...
spec/tasks/gitlab/backup_rake_spec.rb
View file @
2f2b9f67
...
...
@@ -16,7 +16,7 @@ describe 'gitlab:app namespace rake task' do
end
def
reenable_backup_sub_tasks
%w{db repo uploads}
.
each
do
|
subtask
|
%w{db repo uploads
builds
}
.
each
do
|
subtask
|
Rake
::
Task
[
"gitlab:backup:
#{
subtask
}
:create"
].
reenable
end
end
...
...
@@ -160,7 +160,7 @@ describe 'gitlab:app namespace rake task' do
it
"does not contain skipped item"
do
tar_contents
,
exit_status
=
Gitlab
::
Popen
.
popen
(
%W{tar -tvf
#{
@backup_tar
}
db uploads repositories}
%W{tar -tvf
#{
@backup_tar
}
db uploads repositories
builds
}
)
expect
(
tar_contents
).
to
match
(
'db/'
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment