Tests: heavy config refactor/simplification

Also adds Sentinel to appveyor, we hope. Or this will fail miserably.

RedisConfigs/master.conf → RedisConfigs/Basic/master-6379.conf

 port 6379
-dbfilename master.rdb
 databases 2000
 maxmemory 6gb
+dir "../Temp"
 appendonly no
+dbfilename "master-6379.rdb"
 save ""
\ No newline at end of file

RedisConfigs/secure.conf → RedisConfigs/Basic/secure-6381.conf

 port 6381
 requirepass changeme
-dbfilename secure.rdb
 databases 2000
 maxmemory 512mb
+dir "../Temp"
+dbfilename "secure-6381.rdb"
 save ""
\ No newline at end of file

RedisConfigs/slave.conf → RedisConfigs/Basic/slave-6380.conf

 port 6380
 slaveof 127.0.0.1 6379
-dbfilename slave.rdb
 databases 2000
 maxmemory 2gb
 appendonly no
+dir "../Temp"
+dbfilename "slave-6380.rdb"
 save ""
\ No newline at end of file

RedisConfigs/Cluster/7000/redis.conf

-port 7000
-cluster-enabled yes
-cluster-config-file nodes.conf
-cluster-node-timeout 5000
-appendonly yes
\ No newline at end of file

RedisConfigs/Cluster/7001/redis.conf

-port 7001
-cluster-enabled yes
-cluster-config-file nodes.conf
-cluster-node-timeout 5000
-appendonly yes
\ No newline at end of file

RedisConfigs/Cluster/7002/redis.conf

-port 7002
-cluster-enabled yes
-cluster-config-file nodes.conf
-cluster-node-timeout 5000
-appendonly yes
\ No newline at end of file

RedisConfigs/Cluster/7003/redis.conf

-port 7003
-cluster-enabled yes
-cluster-config-file nodes.conf
-cluster-node-timeout 5000
-appendonly yes
\ No newline at end of file

RedisConfigs/Cluster/7004/redis.conf

-port 7004
-cluster-enabled yes
-cluster-config-file nodes.conf
-cluster-node-timeout 5000
-appendonly yes
\ No newline at end of file

RedisConfigs/Cluster/7005/redis.conf

-port 7005
-cluster-enabled yes
-cluster-config-file nodes.conf
-cluster-node-timeout 5000
-appendonly yes
\ No newline at end of file

RedisConfigs/Cluster/cluster-7000.conf

+port 7000
+cluster-enabled yes
+dir "../Temp"
+cluster-config-file "../Cluster/nodes-7000.conf"
+cluster-node-timeout 5000
+appendonly yes
+dbfilename "dump-7000.rdb"
+appendfilename "appendonly-7000.aof"
+save ""
\ No newline at end of file

RedisConfigs/Cluster/cluster-7001.conf

+port 7001
+cluster-enabled yes
+dir "../Temp"
+cluster-config-file "../Cluster/nodes-7001.conf"
+cluster-node-timeout 5000
+appendonly yes
+dbfilename "dump-7001.rdb"
+appendfilename "appendonly-7001.aof"
+save ""
\ No newline at end of file

RedisConfigs/Cluster/cluster-7002.conf

+port 7002
+cluster-enabled yes
+dir "../Temp"
+cluster-config-file "../Cluster/nodes-7002.conf"
+cluster-node-timeout 5000
+appendonly yes
+dbfilename "dump-7002.rdb"
+appendfilename "appendonly-7002.aof"
+save ""
\ No newline at end of file

RedisConfigs/Cluster/cluster-7003.conf

+port 7003
+cluster-enabled yes
+dir "../Temp"
+cluster-config-file "../Cluster/nodes-7003.conf"
+cluster-node-timeout 5000
+appendonly yes
+dbfilename "dump-7003.rdb"
+appendfilename "appendonly-7003.aof"
+save ""
\ No newline at end of file

RedisConfigs/Cluster/cluster-7004.conf

+port 7004
+cluster-enabled yes
+dir "../Temp"
+cluster-config-file "../Cluster/nodes-7004.conf"
+cluster-node-timeout 5000
+appendonly yes
+dbfilename "dump-7004.rdb"
+appendfilename "appendonly-7004.aof"
+save ""
\ No newline at end of file

RedisConfigs/Cluster/cluster-7005.conf

+port 7005
+cluster-enabled yes
+dir "../Temp"
+cluster-config-file "../Cluster/nodes-7005.conf"
+cluster-node-timeout 5000
+appendonly yes
+dbfilename "dump-7005.rdb"
+appendfilename "appendonly-7005.aof"
+save ""
\ No newline at end of file

RedisConfigs/Sentinel/redis-7010.conf

 port 7010
-dbfilename 7010.rdb
 maxmemory 100mb
 appendonly no
+dir "../Temp"
+dbfilename "sentinel-target-7010.rdb"
 save ""
\ No newline at end of file

RedisConfigs/Sentinel/redis-7011.conf

 port 7011
-dbfilename "7011.rdb"
 maxmemory 100mb
 appendonly no
+dir "../Temp"
+dbfilename "sentinel-target-7011.rdb"
 save ""
 slaveof 127.0.0.1 7010
\ No newline at end of file

RedisConfigs/Sentinel/sentinel-26379.conf

@@ -3,4 +3,4 @@ sentinel monitor mymaster 127.0.0.1 7010 1
 sentinel down-after-milliseconds mymaster 1000
 sentinel failover-timeout mymaster 2000
 sentinel config-epoch mymaster 0
-dir "Temp"
\ No newline at end of file
+dir "../Temp"
\ No newline at end of file

RedisConfigs/Sentinel/sentinel-26380.conf

@@ -3,4 +3,4 @@ sentinel monitor mymaster 127.0.0.1 7010 1
 sentinel down-after-milliseconds mymaster 1000
 sentinel failover-timeout mymaster 2000
 sentinel config-epoch mymaster 0
-dir "Temp"
\ No newline at end of file
+dir "../Temp"
\ No newline at end of file

RedisConfigs/Temp/.gitignore

+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
\ No newline at end of file

RedisConfigs/cli-7000.cmd

-@%~dp0\3.0.503\redis-cli.exe -h 127.0.0.1 -p 7000

RedisConfigs/cli-7001.cmd

-@%~dp0\3.0.503\redis-cli.exe -h 127.0.0.1 -p 7001

RedisConfigs/cli-7002.cmd

-@%~dp0\3.0.503\redis-cli.exe -h 127.0.0.1 -p 7002

RedisConfigs/cli-7003.cmd

-@%~dp0\3.0.503\redis-cli.exe -h 127.0.0.1 -p 7003

RedisConfigs/cli-7004.cmd

-@%~dp0\3.0.503\redis-cli.exe -h 127.0.0.1 -p 7004

RedisConfigs/cli-7005.cmd

-@%~dp0\3.0.503\redis-cli.exe -h 127.0.0.1 -p 7005

RedisConfigs/start-all.cmd

+@echo off
+echo Starting Redis servers for testing...
+call %~dp0\start-basic.cmd
+call %~dp0\start-cluster.cmd
+call %~dp0\start-sentinel.cmd
+echo Servers started (minimized).

RedisConfigs/start-basic.cmd

+@echo off
+echo Starting Basic: 
+pushd %~dp0\Basic
+echo   Master: 6379
+@start "Redis (Master): 6379" /min ..\3.0.503\redis-server.exe master-6379.conf
+echo   Slave: 6380
+@start "Redis (Slave): 6380" /min ..\3.0.503\redis-server.exe slave-6380.conf
+echo   Secure: 6381
+@start "Redis (Secure): 6381" /min ..\3.0.503\redis-server.exe secure-6381.conf
+popd
\ No newline at end of file

RedisConfigs/start-cluster.cmd

 @echo off
 echo Starting Cluster: 7000-7005
-pushd %~dp0\Cluster\7000
-@start "Redis (Cluster): 7000" /min ..\..\3.0.503\redis-server.exe redis.conf
-popd
-pushd %~dp0\Cluster\7001
-@start "Redis (Cluster): 7001" /min ..\..\3.0.503\redis-server.exe redis.conf
-popd
-pushd %~dp0\Cluster\7002
-@start "Redis (Cluster): 7002" /min ..\..\3.0.503\redis-server.exe redis.conf
-popd
-pushd %~dp0\Cluster\7003
-@start "Redis (Cluster): 7003" /min ..\..\3.0.503\redis-server.exe redis.conf
-popd
-pushd %~dp0\Cluster\7004
-@start "Redis (Cluster): 7004" /min ..\..\3.0.503\redis-server.exe redis.conf
-popd
-pushd %~dp0\Cluster\7005
-@start "Redis (Cluster): 7005" /min ..\..\3.0.503\redis-server.exe redis.conf
+pushd %~dp0\Cluster
+@start "Redis (Cluster): 7000" /min ..\3.0.503\redis-server.exe cluster-7000.conf
+@start "Redis (Cluster): 7001" /min ..\3.0.503\redis-server.exe cluster-7001.conf
+@start "Redis (Cluster): 7002" /min ..\3.0.503\redis-server.exe cluster-7002.conf
+@start "Redis (Cluster): 7003" /min ..\3.0.503\redis-server.exe cluster-7003.conf
+@start "Redis (Cluster): 7004" /min ..\3.0.503\redis-server.exe cluster-7004.conf
+@start "Redis (Cluster): 7005" /min ..\3.0.503\redis-server.exe cluster-7005.conf
 popd
\ No newline at end of file

RedisConfigs/start-for-tests.cmd

-@echo off
-echo Starting Redis servers on 6379, 6780, 6381, and 7000-7005
-@start "Redis (Master): 6379" /min %~dp0\3.0.503\redis-server.exe %~dp0\master.conf
-@start "Redis (Slave): 6380" /min %~dp0\3.0.503\redis-server.exe %~dp0\slave.conf
-@start "Redis (Secure): 6381" /min %~dp0\3.0.503\redis-server.exe %~dp0\secure.conf
-call %~dp0\start-cluster.cmd
-call %~dp0\start-sentinel.cmd
-echo Servers started (minimized).

RedisConfigs/start-master.cmd

-@%~dp0\3.0.503\redis-server.exe %~dp0\master.conf

RedisConfigs/start-secure.cmd

-@%~dp0\3.0.503\redis-server.exe %~dp0\secure.conf

RedisConfigs/start-sentinel.cmd

 @echo off
-echo Starting Sentinel Targets: 7010-7011
+echo Starting Sentinel:
 pushd %~dp0\Sentinel
+echo   Targets: 7010-7011
 @start "Redis (Sentinel-Target): 7010" /min ..\3.0.503\redis-server.exe redis-7010.conf
 @start "Redis (Sentinel-Target): 7011" /min ..\3.0.503\redis-server.exe redis-7011.conf
-echo Starting Sentinel Monitors: 26379-26380
+echo   Monitors: 26379-26380
 @start "Redis (Sentinel): 26379" /min ..\3.0.503\redis-server.exe sentinel-26379.conf --sentinel
 @start "Redis (Sentinel): 26380" /min ..\3.0.503\redis-server.exe sentinel-26380.conf --sentinel
 popd
\ No newline at end of file

RedisConfigs/start-slave.cmd

-@%~dp0\3.0.503\redis-server.exe %~dp0\slave.conf

StackExchange.Redis.sln

@@ -12,22 +12,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "RedisConfigs", "RedisConfigs", "{96E891CD-2ED7-4293-A7AB-4C6F5D8D2B05}"
 	ProjectSection(SolutionItems) = preProject
-		RedisConfigs\master.conf = RedisConfigs\master.conf
-		RedisConfigs\redis-cli 7000.cmd = RedisConfigs\redis-cli 7000.cmd
-		RedisConfigs\redis-cli 7001.cmd = RedisConfigs\redis-cli 7001.cmd
-		RedisConfigs\redis-cli 7002.cmd = RedisConfigs\redis-cli 7002.cmd
-		RedisConfigs\redis-cli 7003.cmd = RedisConfigs\redis-cli 7003.cmd
-		RedisConfigs\redis-cli 7004.cmd = RedisConfigs\redis-cli 7004.cmd
-		RedisConfigs\redis-cli 7005.cmd = RedisConfigs\redis-cli 7005.cmd
-		RedisConfigs\redis-cli master.cmd = RedisConfigs\redis-cli master.cmd
-		RedisConfigs\redis-cli secure.cmd = RedisConfigs\redis-cli secure.cmd
-		RedisConfigs\redis-cli slave.cmd = RedisConfigs\redis-cli slave.cmd
-		RedisConfigs\redis-server all local.cmd = RedisConfigs\redis-server all local.cmd
-		RedisConfigs\redis-server master.cmd = RedisConfigs\redis-server master.cmd
-		RedisConfigs\redis-server secure.cmd = RedisConfigs\redis-server secure.cmd
-		RedisConfigs\redis-server slave.cmd = RedisConfigs\redis-server slave.cmd
-		RedisConfigs\secure.conf = RedisConfigs\secure.conf
-		RedisConfigs\slave.conf = RedisConfigs\slave.conf
+		RedisConfigs\cli-master.cmd = RedisConfigs\cli-master.cmd
+		RedisConfigs\cli-secure.cmd = RedisConfigs\cli-secure.cmd
+		RedisConfigs\cli-slave.cmd = RedisConfigs\cli-slave.cmd
+		RedisConfigs\start-all.cmd = RedisConfigs\start-all.cmd
+		RedisConfigs\start-basic.cmd = RedisConfigs\start-basic.cmd
+		RedisConfigs\start-cluster.cmd = RedisConfigs\start-cluster.cmd
+		RedisConfigs\start-sentinel.cmd = RedisConfigs\start-sentinel.cmd
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StackExchange.Redis", "StackExchange.Redis\StackExchange.Redis.csproj", "{EF84877F-59BE-41BE-9013-E765AF0BB72E}"
@@ -42,6 +33,37 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NRediSearch", "NRediSearch\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NRediSearch.Test", "NRediSearch.Test\NRediSearch.Test.csproj", "{94D233F5-2400-4542-98B9-BA72005C57DC}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sentinel", "Sentinel", "{36255A0A-89EC-43C8-A642-F4C1ACAEF5BC}"
+	ProjectSection(SolutionItems) = preProject
+		RedisConfigs\Sentinel\redis-7010.conf = RedisConfigs\Sentinel\redis-7010.conf
+		RedisConfigs\Sentinel\redis-7011.conf = RedisConfigs\Sentinel\redis-7011.conf
+		RedisConfigs\Sentinel\sentinel-26379.conf = RedisConfigs\Sentinel\sentinel-26379.conf
+		RedisConfigs\Sentinel\sentinel-26380.conf = RedisConfigs\Sentinel\sentinel-26380.conf
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Cluster", "Cluster", "{A3B4B972-5BD2-4D90-981F-7E51E350E628}"
+	ProjectSection(SolutionItems) = preProject
+		RedisConfigs\Cluster\cluster-7000.conf = RedisConfigs\Cluster\cluster-7000.conf
+		RedisConfigs\Cluster\cluster-7001.conf = RedisConfigs\Cluster\cluster-7001.conf
+		RedisConfigs\Cluster\cluster-7002.conf = RedisConfigs\Cluster\cluster-7002.conf
+		RedisConfigs\Cluster\cluster-7003.conf = RedisConfigs\Cluster\cluster-7003.conf
+		RedisConfigs\Cluster\cluster-7004.conf = RedisConfigs\Cluster\cluster-7004.conf
+		RedisConfigs\Cluster\cluster-7005.conf = RedisConfigs\Cluster\cluster-7005.conf
+		RedisConfigs\Cluster\nodes-7000.conf = RedisConfigs\Cluster\nodes-7000.conf
+		RedisConfigs\Cluster\nodes-7001.conf = RedisConfigs\Cluster\nodes-7001.conf
+		RedisConfigs\Cluster\nodes-7002.conf = RedisConfigs\Cluster\nodes-7002.conf
+		RedisConfigs\Cluster\nodes-7003.conf = RedisConfigs\Cluster\nodes-7003.conf
+		RedisConfigs\Cluster\nodes-7004.conf = RedisConfigs\Cluster\nodes-7004.conf
+		RedisConfigs\Cluster\nodes-7005.conf = RedisConfigs\Cluster\nodes-7005.conf
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Basic", "Basic", "{38BDEEED-7BEB-4B1F-9CE0-256D63F9C502}"
+	ProjectSection(SolutionItems) = preProject
+		RedisConfigs\Basic\master-6379.conf = RedisConfigs\Basic\master-6379.conf
+		RedisConfigs\Basic\secure-6381.conf = RedisConfigs\Basic\secure-6381.conf
+		RedisConfigs\Basic\slave-6380.conf = RedisConfigs\Basic\slave-6380.conf
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -115,6 +137,11 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{36255A0A-89EC-43C8-A642-F4C1ACAEF5BC} = {96E891CD-2ED7-4293-A7AB-4C6F5D8D2B05}
+		{A3B4B972-5BD2-4D90-981F-7E51E350E628} = {96E891CD-2ED7-4293-A7AB-4C6F5D8D2B05}
+		{38BDEEED-7BEB-4B1F-9CE0-256D63F9C502} = {96E891CD-2ED7-4293-A7AB-4C6F5D8D2B05}
+	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {193AA352-6748-47C1-A5FC-C9AA6B5F000B}
 	EndGlobalSection

appveyor.yml

@@ -4,46 +4,7 @@ init:
   - git config --global core.autocrlf input
 
 install:
-- cmd: >-
-    cd RedisConfigs\3.0.503
-
-    redis-server.exe --service-install --service-name "redis-master" "..\master.conf"
-
-    redis-server.exe --service-install --service-name "redis-slave" "..\slave.conf"
-
-    redis-server.exe --service-install --service-name "redis-secure" "..\secure.conf"
-
-    redis-server.exe --service-start --service-name "redis-master"
-
-    redis-server.exe --service-start --service-name "redis-slave"
-
-    redis-server.exe --service-start --service-name "redis-secure"
-
-    redis-server.exe --service-install --service-name "redis-7000" "..\Cluster\7000\redis.conf" --dir "..\Cluster\7000"
-
-    redis-server.exe --service-install --service-name "redis-7001" "..\Cluster\7001\redis.conf" --dir "..\Cluster\7001"
-
-    redis-server.exe --service-install --service-name "redis-7002" "..\Cluster\7002\redis.conf" --dir "..\Cluster\7002"
-
-    redis-server.exe --service-install --service-name "redis-7003" "..\Cluster\7003\redis.conf" --dir "..\Cluster\7003"
-
-    redis-server.exe --service-install --service-name "redis-7004" "..\Cluster\7004\redis.conf" --dir "..\Cluster\7004"
-
-    redis-server.exe --service-install --service-name "redis-7005" "..\Cluster\7005\redis.conf" --dir "..\Cluster\7005"
-
-    redis-server.exe --service-start --service-name "redis-7000"
-
-    redis-server.exe --service-start --service-name "redis-7001"
-
-    redis-server.exe --service-start --service-name "redis-7002"
-
-    redis-server.exe --service-start --service-name "redis-7003"
-
-    redis-server.exe --service-start --service-name "redis-7004"
-
-    redis-server.exe --service-start --service-name "redis-7005"
-
-    cd ..\..
+- cmd: start RedisConfigs\start-all.cmd
 
 skip_branch_with_pr: true
 skip_tags: true

docs/Testing.md

@@ -35,7 +35,7 @@ The tests are run (by default) as part of the build. You can simply run this in
 To specifically run the tests with far more options, from the repository root:
 ```cmd
 dotnet build
-.\RedisConfigs\start-for-tests.cmd
+.\RedisConfigs\start-all.cmd
 cd StackExchange.Redis.Tests
 dotnet xunit
 ```
\ No newline at end of file