💚 Redis CI

dotnetcore · Jan 27, 2019 · 16c2457 · 16c2457
1 parent 6d3403a
commit 16c2457
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 12 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -29,8 +29,10 @@ for:
   install:
   - ps: cd c:\projects\easycaching\tools\RedisConfigs\3.0.503\
   - ps: .\redis-server.exe --service-install --service-name "redis-6379" "..\Basic\master-6379.conf"
+  - ps: .\redis-server.exe --service-install --service-name "redis-6380" "..\Basic\master-6380.conf"
   - ps: .\redis-server.exe --service-install --service-name "redis-6388" "..\Basic\master-6388.conf"
   - ps: net start redis-6379
+  - ps: net start redis-6380
   - ps: net start redis-6388
   - ps: new-service –Name memcached1 –DisplayName memcached1 –BinaryPathName “c:\projects\easycaching\tools\memcached\memcached.exe -d runservice -m 64 -c 2048 -p 11211” –StartupType Automatic
   - ps: new-service –Name memcached2 –DisplayName memcached2 –BinaryPathName “c:\projects\easycaching\tools\memcached\memcached.exe -d runservice -m 64 -c 2048 -p 11212” –StartupType Automatic  
@@ -59,7 +61,8 @@ for:
 
   install:
   #- sh: sudo apt-get install libevent libevent-deve
-  - sh: redis-server -h
+  - sh: redis-server /home/appveyor/projects/easycaching/tools/RedisConfigs/Basic/master-6388.conf
+  - sh: redis-server /home/appveyor/projects/easycaching/tools/RedisConfigs/Basic/master-6380.conf
   - sh: sudo apt-get install memcached
   - sh: sudo memcached -p 11211 -u root -m 64m -d
   - sh: sudo memcached -p 11212 -u root -m 64m -d

diff --git a/test/EasyCaching.UnitTests/CachingTests/CSRedisCachingProviderTest.cs b/test/EasyCaching.UnitTests/CachingTests/CSRedisCachingProviderTest.cs
@@ -19,7 +19,7 @@ public CSRedisCachingProviderTest()
                     {
                         ConnectionStrings = new System.Collections.Generic.List<string>
                         {
-                            "127.0.0.1:6379,defaultDatabase=13,poolsize=10"
+                            "127.0.0.1:6388,defaultDatabase=13,poolsize=10"
                         }
                     };
                 });
@@ -48,7 +48,7 @@ public CSRedisFeatureCachingProviderTest()
                     {
                         ConnectionStrings = new System.Collections.Generic.List<string>
                         {
-                            "127.0.0.1:6379,defaultDatabase=10,poolsize=10"
+                            "127.0.0.1:6388,defaultDatabase=10,poolsize=10"
                         }
                     };
                 });

diff --git a/test/EasyCaching.UnitTests/CachingTests/RedisCachingProviderTest.cs b/test/EasyCaching.UnitTests/CachingTests/RedisCachingProviderTest.cs
@@ -18,7 +18,7 @@ public RedisCachingProviderTest()
                 {
                     AllowAdmin = true
                 };
-                options.DBConfig.Endpoints.Add(new ServerEndPoint("127.0.0.1", 6379));
+                options.DBConfig.Endpoints.Add(new ServerEndPoint("127.0.0.1", 6380));
                 options.DBConfig.Database = 5;
             });
             IServiceProvider serviceProvider = services.BuildServiceProvider();
@@ -39,7 +39,7 @@ public void Fulsh_Should_Fail_When_AllowAdmin_Is_False()
             IServiceCollection services = new ServiceCollection();
             services.AddDefaultRedisCache(options =>
             {
-                options.DBConfig.Endpoints.Add(new ServerEndPoint("127.0.0.1", 6379));
+                options.DBConfig.Endpoints.Add(new ServerEndPoint("127.0.0.1", 6380));
             });
             IServiceProvider serviceProvider = services.BuildServiceProvider();
             var provider = serviceProvider.GetService<IEasyCachingProvider>();
@@ -75,7 +75,7 @@ public void Use_Configuration_String_Should_Succeed()
             IServiceCollection services = new ServiceCollection();
             services.AddDefaultRedisCache(options =>
             {
-                options.DBConfig.Configuration = "127.0.0.1:6379,allowAdmin=false,defaultdatabase=8";
+                options.DBConfig.Configuration = "127.0.0.1:6380,allowAdmin=false,defaultdatabase=8";
             });
             IServiceProvider serviceProvider = services.BuildServiceProvider();
             var dbProvider = serviceProvider.GetService<IRedisDatabaseProvider>();
@@ -98,7 +98,7 @@ public RedisCachingProviderWithFactoryTest()
                 {
                     AllowAdmin = true
                 };
-                options.DBConfig.Endpoints.Add(new ServerEndPoint("127.0.0.1", 6379));
+                options.DBConfig.Endpoints.Add(new ServerEndPoint("127.0.0.1", 6380));
                 options.DBConfig.Database = 3;
             });
             services.AddDefaultRedisCacheWithFactory(SECOND_PROVIDER_NAME, options =>
@@ -107,7 +107,7 @@ public RedisCachingProviderWithFactoryTest()
                 {
                     AllowAdmin = true
                 };
-                options.DBConfig.Endpoints.Add(new ServerEndPoint("127.0.0.1", 6379));
+                options.DBConfig.Endpoints.Add(new ServerEndPoint("127.0.0.1", 6380));
                 options.DBConfig.Database = 4;
             });
             IServiceProvider serviceProvider = services.BuildServiceProvider();

diff --git a/tools/RedisConfigs/Basic/master-6379.conf b/tools/RedisConfigs/Basic/master-6379.conf
@@ -1,7 +1,7 @@
 port 6379
 databases 2000
 maxmemory 6gb
-dir "../Temp"
 appendonly no
 dbfilename "master-6379.rdb"
-save ""
+save ""
+daemonize yes
diff --git a/tools/RedisConfigs/Basic/master-6380.conf b/tools/RedisConfigs/Basic/master-6380.conf
@@ -0,0 +1,7 @@
+port 6380
+databases 2000
+maxmemory 6gb
+appendonly no
+dbfilename "master-6380.rdb"
+save ""
+daemonize yes
diff --git a/tools/RedisConfigs/Basic/master-6388.conf b/tools/RedisConfigs/Basic/master-6388.conf
@@ -1,7 +1,7 @@
 port 6388
 databases 2000
 maxmemory 6gb
-dir "../Temp"
 appendonly no
 dbfilename "master-6388.rdb"
-save ""
+save ""
+daemonize yes