Bladeren bron

Merge branch 'release/2.1.0' of VitormLib/Vitorm.ClickHouse into master

LithWang 8 maanden geleden
bovenliggende
commit
2fb07a4075

+ 1 - 1
Publish/DevOps3/environment/build-bash__10.Test__#1.InitEnv.sh

@@ -28,7 +28,7 @@ echo '#build-bash__10.Test__#1.InitEnv.sh -> #8 wait for containers to init'
 
 
 echo '#build-bash__10.Test__#1.InitEnv.sh -> #8.1 wait for ClickHouse to init' 
-docker run -t --rm --link vitorm-clickhouse curlimages/curl sh -c 'until curl "http://vitorm-clickhouse:8123/?query=" -s --data-binary "SELECT 1"; do echo waiting for ClickHouse; sleep 2; done;    curl "http://vitorm-clickhouse:8123/?query=" -s --data-binary "create database if not exists db_orm;";    curl "http://vitorm-clickhouse:8123/?query=" -s --data-binary "create database if not exists db_orm2;";    curl "http://vitorm-clickhouse:8123/?query=" -s --data-binary "create database if not exists db_orm22;";'
+docker run -t --rm --link vitorm-clickhouse curlimages/curl timeout 120 sh -c 'until curl "http://vitorm-clickhouse:8123/?query=" -s --data-binary "SELECT 1"; do echo waiting for ClickHouse; sleep 2; done;    curl "http://vitorm-clickhouse:8123/?query=" -s --data-binary "create database if not exists db_orm;";    curl "http://vitorm-clickhouse:8123/?query=" -s --data-binary "create database if not exists db_orm2;";    curl "http://vitorm-clickhouse:8123/?query=" -s --data-binary "create database if not exists db_orm22;";'
 
 
 #---------------------------------------------------------------------

+ 3 - 1
test/Vitorm.ClickHouse.MsTest/CommonTest/Property_Bool_Test.cs

@@ -13,7 +13,7 @@ namespace Vitorm.MsTest.CommonTest
         [TestMethod]
         public void Test()
         {
-            using var dbContext = DataSource.CreateDbContext();
+            using var dbContext = DataSource.CreateDbContextForWriting();
 
             // #1 Init
             var name = Guid.NewGuid().ToString();
@@ -24,6 +24,8 @@ namespace Vitorm.MsTest.CommonTest
             dbSet.Add(new MyUser { id = 2, enable = true, isEven = true });
             dbSet.Add(new MyUser { id = 3, enable = false, isEven = false });
 
+            DataSource.WaitForUpdate();
+
             // #2 Assert
             {
                 var user = dbSet.Query().Where(m => m.enable == true).OrderBy(m => m.id).First();