diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-05-12 21:32:37 +0000 |
|---|---|---|
| committer | Regis <boudinot.regis@yahoo.com> | 2017-05-12 15:34:15 -0600 |
| commit | a72ad95e22f607cc28d71b636bb43c6a300231c7 (patch) | |
| tree | 8f4539f1c8e6b664ee1fbba231518f71a0096c06 | |
| parent | fb1211fe8a88590f319b9627c7e143e56ccbae0b (diff) | |
| download | gitlab-ce-a72ad95e22f607cc28d71b636bb43c6a300231c7.tar.gz | |
Merge branch 'sh-relax-backup-rake-spec' into 'master'
Relax rake backup regex to handle CE and EE RCs
See merge request !11345
| -rw-r--r-- | spec/tasks/gitlab/backup_rake_spec.rb | 2 |
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 aee926877e0..4def113dd77 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|-rc\d+)?_gitlab_backup.tar$/) + expect(@backup_tar).to match(/\d+_\d{4}_\d{2}_\d{2}_\d+\.\d+\.\d+.*_gitlab_backup.tar$/) end end end # gitlab:app namespace |