Merge remote-tracking branch 'origin/master'

src/main/java/com/xiaomai/cases/lunar/reserve/TestAddToQueue.java

@@ -222,7 +222,7 @@ public class TestAddToQueue extends BaseTestImpl {
                 memberInfo.set(2,reserveId);  //将原来的id替换成新的id
                 memberInfo.set(2,reserveId);  //将原来的id替换成新的id
 
 
                 try {
                 try {
-                    Thread.sleep(1000);
+                    Thread.sleep(5000);
                 } catch (InterruptedException e) {
                 } catch (InterruptedException e) {
                     throw new RuntimeException(e);
                     throw new RuntimeException(e);
                 }
                 }

src/main/java/com/xiaomai/cases/polar/setting/tag/TagTools.java

@@ -60,7 +60,7 @@ public class TagTools extends XMBaseTest {
         deleteTag.put("brandId",xmAppApi.getLoginInfo().getBrandId());
         deleteTag.put("brandId",xmAppApi.getLoginInfo().getBrandId());
         deleteTag.put("studioId",xmAppApi.getLoginInfo().getStudioId());
         deleteTag.put("studioId",xmAppApi.getLoginInfo().getStudioId());
         deleteTag.put("id",id);
         deleteTag.put("id",id);
-        deleteTag.put("confirm","");
+        deleteTag.put("confirm",null);
 
 
         dataApi.doRequest(RequestType.JSON, dataparams, deleteTag.toJSONString(), dataheadrs).assetsSuccess(true);
         dataApi.doRequest(RequestType.JSON, dataparams, deleteTag.toJSONString(), dataheadrs).assetsSuccess(true);
         JSONObject response=dataApi.getBodyInJSON();
         JSONObject response=dataApi.getBodyInJSON();

src/main/java/com/xiaomai/cases/polar/setting/tag/TestCreate.java

@@ -91,6 +91,15 @@ public class TestCreate extends XMBaseTest {
         Assert.assertEquals(success,"false","相同标签不能添加，但可添加");
         Assert.assertEquals(success,"false","相同标签不能添加，但可添加");
         Assert.assertEquals(code,"error/.TAG_NAME_DUPLICATE","同标签名已存在，不可重复");
         Assert.assertEquals(code,"error/.TAG_NAME_DUPLICATE","同标签名已存在，不可重复");
 
 
+
+
+
+        try {
+            Thread.sleep(3000);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+
     }
     }