Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
8b8bab11
Commit
8b8bab11
authored
Oct 10, 2017
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Stub ENV in the backup task spec file
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
9c71fb0d
Changes
3
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
109 additions
and
188 deletions
+109
-188
lib/backup/manager.rb
lib/backup/manager.rb
+39
-39
spec/lib/gitlab/backup/manager_spec.rb
spec/lib/gitlab/backup/manager_spec.rb
+0
-4
spec/tasks/gitlab/backup_rake_spec.rb
spec/tasks/gitlab/backup_rake_spec.rb
+70
-145
No files found.
lib/backup/manager.rb
View file @
8b8bab11
...
@@ -101,8 +101,7 @@ module Backup
...
@@ -101,8 +101,7 @@ module Backup
end
end
def
unpack
def
unpack
Dir
.
chdir
(
backup_path
)
Dir
.
chdir
(
backup_path
)
do
# check for existing backups in the backup dir
# check for existing backups in the backup dir
if
backup_file_list
.
empty?
if
backup_file_list
.
empty?
$progress
.
puts
"No backups found in
#{
backup_path
}
"
$progress
.
puts
"No backups found in
#{
backup_path
}
"
...
@@ -147,6 +146,7 @@ module Backup
...
@@ -147,6 +146,7 @@ module Backup
exit
1
exit
1
end
end
end
end
end
def
tar_version
def
tar_version
tar_version
,
_
=
Gitlab
::
Popen
.
popen
(
%w(tar --version)
)
tar_version
,
_
=
Gitlab
::
Popen
.
popen
(
%w(tar --version)
)
...
...
spec/lib/gitlab/backup/manager_spec.rb
View file @
8b8bab11
...
@@ -172,10 +172,6 @@ describe Backup::Manager do
...
@@ -172,10 +172,6 @@ describe Backup::Manager do
end
end
describe
'#unpack'
do
describe
'#unpack'
do
before
do
allow
(
Dir
).
to
receive
(
:chdir
)
end
context
'when there are no backup files in the directory'
do
context
'when there are no backup files in the directory'
do
before
do
before
do
allow
(
Dir
).
to
receive
(
:glob
).
and_return
([])
allow
(
Dir
).
to
receive
(
:glob
).
and_return
([])
...
...
spec/tasks/gitlab/backup_rake_spec.rb
View file @
8b8bab11
This diff is collapsed.
Click to expand it.
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