diff options
| author | Gabriel Mazetto <brodock@gmail.com> | 2015-11-27 14:32:32 -0200 |
|---|---|---|
| committer | Gabriel Mazetto <gabriel@gitlab.com> | 2016-08-04 18:55:37 +0200 |
| commit | ef6043880ee492e6c8fd7672d0e36ca81a62cfc9 (patch) | |
| tree | ad4b3d2b1e92bae8bb563d459dc24c5b2691f3a4 /spec/fixtures/config | |
| parent | 926cee002d701548b5344e0b93e95beb3802fd54 (diff) | |
| download | gitlab-ce-ef6043880ee492e6c8fd7672d0e36ca81a62cfc9.tar.gz | |
Specs for RedisConfig
Make sure :url is not present on RedisConfig.params after parsing
Diffstat (limited to 'spec/fixtures/config')
| -rw-r--r-- | spec/fixtures/config/redis_new_format_host.yml | 29 | ||||
| -rw-r--r-- | spec/fixtures/config/redis_new_format_socket.yml | 6 | ||||
| -rw-r--r-- | spec/fixtures/config/redis_old_format_host.yml | 5 | ||||
| -rw-r--r-- | spec/fixtures/config/redis_old_format_socket.yml | 3 |
4 files changed, 43 insertions, 0 deletions
diff --git a/spec/fixtures/config/redis_new_format_host.yml b/spec/fixtures/config/redis_new_format_host.yml new file mode 100644 index 00000000000..5e5bf6e0ccd --- /dev/null +++ b/spec/fixtures/config/redis_new_format_host.yml @@ -0,0 +1,29 @@ +# redis://[:password@]host[:port][/db-number][?option=value] +# more details: http://www.iana.org/assignments/uri-schemes/prov/redis +development: + url: redis://:mypassword@localhost:6379/99 + sentinels: + - + host: localhost + port: 26380 # point to sentinel, not to redis port + - + host: slave2 + port: 26381 # point to sentinel, not to redis port +test: + url: redis://:mypassword@localhost:6379/99 + sentinels: + - + host: localhost + port: 26380 # point to sentinel, not to redis port + - + host: slave2 + port: 26381 # point to sentinel, not to redis port +production: + url: redis://:mypassword@localhost:6379/99 + sentinels: + - + host: slave1 + port: 26380 # point to sentinel, not to redis port + - + host: slave2 + port: 26381 # point to sentinel, not to redis port diff --git a/spec/fixtures/config/redis_new_format_socket.yml b/spec/fixtures/config/redis_new_format_socket.yml new file mode 100644 index 00000000000..4e76830c281 --- /dev/null +++ b/spec/fixtures/config/redis_new_format_socket.yml @@ -0,0 +1,6 @@ +development: + url: unix:/path/to/redis.sock +test: + url: unix:/path/to/redis.sock +production: + url: unix:/path/to/redis.sock diff --git a/spec/fixtures/config/redis_old_format_host.yml b/spec/fixtures/config/redis_old_format_host.yml new file mode 100644 index 00000000000..253d0a994f5 --- /dev/null +++ b/spec/fixtures/config/redis_old_format_host.yml @@ -0,0 +1,5 @@ +# redis://[:password@]host[:port][/db-number][?option=value] +# more details: http://www.iana.org/assignments/uri-schemes/prov/redis +development: redis://:mypassword@localhost:6379/99 +test: redis://:mypassword@localhost:6379/99 +production: redis://:mypassword@localhost:6379/99 diff --git a/spec/fixtures/config/redis_old_format_socket.yml b/spec/fixtures/config/redis_old_format_socket.yml new file mode 100644 index 00000000000..cb39b6fb9e2 --- /dev/null +++ b/spec/fixtures/config/redis_old_format_socket.yml @@ -0,0 +1,3 @@ +development: unix:/path/to/redis.sock +test: unix:/path/to/redis.sock +production: unix:/path/to/redis.sock |