summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2017-05-12 13:58:09 +0000
committerStan Hu <stanhu@gmail.com>2017-05-12 13:58:09 +0000
commitb187377105796ff0857df52f27cc702bc0e85370 (patch)
tree8b3d21b2661247b3fc589ee3af02102eb62bf55d
parent99f36c2ca69de17235eeab53f510753b6c1ae7c4 (diff)
parent5bed3390aa9f9df96552ef0a2c1911bcfc36974e (diff)
downloadgitlab-ce-b187377105796ff0857df52f27cc702bc0e85370.tar.gz
Merge branch 'sh-fix-failing-rc1-backup-spec' into 'master'
Fix failing backup filename spec for RCs See merge request !11318
-rw-r--r--spec/tasks/gitlab/backup_rake_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/tasks/gitlab/backup_rake_spec.rb b/spec/tasks/gitlab/backup_rake_spec.rb
index df2f2ce95e6..aee926877e0 100644
--- a/spec/tasks/gitlab/backup_rake_spec.rb
+++ b/spec/tasks/gitlab/backup_rake_spec.rb
@@ -352,7 +352,7 @@ describe 'gitlab:app namespace rake task' do
end
it 'name has human readable time' do
- expect(@backup_tar).to match(/\d+_\d{4}_\d{2}_\d{2}_\d+\.\d+\.\d+(-pre)?_gitlab_backup.tar$/)
+ expect(@backup_tar).to match(/\d+_\d{4}_\d{2}_\d{2}_\d+\.\d+\.\d+(-pre|-rc\d+)?_gitlab_backup.tar$/)
end
end
end # gitlab:app namespace