diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-04-03 08:49:47 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-04-03 08:49:47 +0000 |
| commit | 9157985cfce1391973673ea278dc7506a90f8f53 (patch) | |
| tree | 5d53823622d6ebde0ed2784513418445efd6e550 | |
| parent | 317206300d56eb2fc4f7c3701151f47f8f1e6eef (diff) | |
| parent | b277f23a538ffbbf100719f4d7434a9e458d5b5e (diff) | |
| download | gitlab-ce-9157985cfce1391973673ea278dc7506a90f8f53.tar.gz | |
Merge branch 'fix-backup-spec-regexp' into 'master'
Improve regexp to prevent false positives
If a filename happened to contain "db" and enough "rwx" characters before, then
this test would previously fail. For example:
```
drwxr-xr-x gitlab-runner/gitlab-runner 0 2015-04-02 07:46 uploads/tmp/cassidy.stokes8477/gitlabhq/36d972fa55d6b44810fc6fd843473adb/
```
Adding a space before the "db" match string tightens up the regexp and reduces the
chance of an unintended match.
See merge request !489
| -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 60144be5510..a59f74c2121 100644 --- a/spec/tasks/gitlab/backup_rake_spec.rb +++ b/spec/tasks/gitlab/backup_rake_spec.rb @@ -87,7 +87,7 @@ describe 'gitlab:app namespace rake task' do expect(tar_contents).to match('db/') expect(tar_contents).to match('uploads/') expect(tar_contents).to match('repositories/') - expect(tar_contents).not_to match(/^.{4,9}[rwx].*(db|uploads|repositories)\/$/) + expect(tar_contents).not_to match(/^.{4,9}[rwx].* (db|uploads|repositories)\/$/) end it 'should delete temp directories' do |