Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
123b3f615712
Commit
0c8aec5f
authored
Mar 06, 2018
by
Shinya Maeda
Browse files
Introduce FailedToExtractError. Fix spec. Add DNS test mock.
parent
cb46cddd96df
Changes
4
Hide whitespace changes
Inline
Side-by-side
app/services/projects/update_pages_service.rb
View file @
123b3f61
module
Projects
class
UpdatePagesService
<
BaseService
InvaildStateError
=
Class
.
new
(
StandardError
)
FailedToExtractError
=
Class
.
new
(
StandardError
)
BLOCK_SIZE
=
32
.
kilobytes
MAX_SIZE
=
1
.
terabyte
...
...
@@ -30,13 +31,13 @@ def execute
# Check if we did extract public directory
archive_public_path
=
File
.
join
(
archive_path
,
'public'
)
raise
InvaildState
Error
,
'pages miss the public folder'
unless
Dir
.
exist?
(
archive_public_path
)
raise
FailedToExtract
Error
,
'pages miss the public folder'
unless
Dir
.
exist?
(
archive_public_path
)
raise
InvaildStateError
,
'pages are outdated'
unless
latest?
deploy_page!
(
archive_public_path
)
success
end
rescue
InvaildStateError
=>
e
rescue
InvaildStateError
,
FailedToExtractError
=>
e
register_failure
error
(
e
.
message
)
end
...
...
@@ -75,7 +76,7 @@ def extract_archive!(temp_path)
elsif
artifacts
.
ends_with?
(
'.zip'
)
extract_zip_archive!
(
temp_path
)
else
raise
'unsupported artifacts format'
raise
FailedToExtractError
,
'unsupported artifacts format'
end
end
...
...
@@ -84,17 +85,17 @@ def extract_tar_archive!(temp_path)
%W(dd bs=
#{
BLOCK_SIZE
}
count=
#{
blocks
}
)
,
%W(tar -x -C
#{
temp_path
}
#{
SITE_PATH
}
)
,
err:
'/dev/null'
)
raise
'pages failed to extract'
unless
results
.
compact
.
all?
(
&
:success?
)
raise
FailedToExtractError
,
'pages failed to extract'
unless
results
.
compact
.
all?
(
&
:success?
)
end
def
extract_zip_archive!
(
temp_path
)
raise
'missing artifacts metadata'
unless
build
.
artifacts_metadata?
raise
FailedToExtractError
,
'missing artifacts metadata'
unless
build
.
artifacts_metadata?
# Calculate page size after extract
public_entry
=
build
.
artifacts_metadata_entry
(
SITE_PATH
,
recursive:
true
)
if
public_entry
.
total_size
>
max_size
raise
"artifacts for pages are too large:
#{
public_entry
.
total_size
}
"
raise
FailedToExtractError
,
"artifacts for pages are too large:
#{
public_entry
.
total_size
}
"
end
# Requires UnZip at least 6.00 Info-ZIP.
...
...
@@ -103,7 +104,7 @@ def extract_zip_archive!(temp_path)
# We add * to end of SITE_PATH, because we want to extract SITE_PATH and all subdirectories
site_path
=
File
.
join
(
SITE_PATH
,
'*'
)
unless
system
(
*
%W(unzip -qq -n
#{
artifacts
}
#{
site_path
}
-d
#{
temp_path
}
)
)
raise
'pages failed to extract'
raise
FailedToExtractError
,
'pages failed to extract'
end
end
...
...
spec/features/projects/jobs/user_browses_job_spec.rb
View file @
123b3f61
...
...
@@ -31,7 +31,5 @@
page
.
within
(
'.erased'
)
do
expect
(
page
).
to
have_content
(
'Job has been erased'
)
end
expect
(
build
.
project
.
running_or_pending_build_count
).
to
eq
(
build
.
project
.
builds
.
running_or_pending
.
count
(
:all
))
end
end
spec/features/projects/pages_spec.rb
View file @
123b3f61
...
...
@@ -258,7 +258,7 @@
end
let
(
:ci_build
)
do
build
(
create
(
:ci_build
,
project:
project
,
pipeline:
pipeline
,
...
...
spec/services/projects/update_pages_service_spec.rb
View file @
123b3f61
...
...
@@ -34,6 +34,7 @@
context
'with expiry date'
do
before
do
build
.
artifacts_expire_in
=
"2 days"
build
.
save!
end
it
"doesn't delete artifacts"
do
...
...
@@ -105,6 +106,7 @@
context
'with expiry date'
do
before
do
build
.
artifacts_expire_in
=
"2 days"
build
.
save!
end
it
"doesn't delete artifacts"
do
...
...
@@ -159,6 +161,17 @@
expect
(
execute
).
not_to
eq
(
:success
)
end
context
'when timeout happens by DNS error'
do
before
do
allow_any_instance_of
(
Projects
::
UpdatePagesService
)
.
to
receive
(
:extract_zip_archive!
).
and_raise
(
SocketError
)
end
it
'raises an error'
do
expect
{
execute
}.
to
raise_error
(
SocketError
)
end
end
end
end
...
...
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