diff --git a/module/cne/test/model/certinfo.php b/module/cne/test/model/certinfo.php index 59dc6f8950..ff0816e04a 100755 --- a/module/cne/test/model/certinfo.php +++ b/module/cne/test/model/certinfo.php @@ -9,7 +9,7 @@ cid=1 - 证书名称为空 @0 - 证书名称错误 @0 -- 证书名称正确第sans条的0属性 @dops.corp.cc +- 证书名称正确第sans条的0属性 @g79n.corp.cc */ @@ -25,4 +25,4 @@ $certName = 'fail-name'; r($cneModel->certInfoTest($certName)) && p() && e('0'); // 证书名称错误 $certName = 'tls-haogs-cn'; -r($cneModel->certInfoTest($certName)) && p('sans:0') && e('pgeo.corp.cc'); // 证书名称正确 +r($cneModel->certInfoTest($certName)) && p('sans:0') && e('g79n.corp.cc'); // 证书名称正确 diff --git a/module/cne/test/model/cnemetrics.php b/module/cne/test/model/cnemetrics.php index f12775b279..4d3e55c4e7 100755 --- a/module/cne/test/model/cnemetrics.php +++ b/module/cne/test/model/cnemetrics.php @@ -14,9 +14,9 @@ cid=1 include dirname(__FILE__, 5) . '/test/lib/init.php'; global $tester, $config; -$config->CNE->api->host = 'http://20.205.128.72:32380'; -$config->CNE->api->token = 'esVqIv7c1LxMCwlCdCBv73LZTYANoApK'; -$config->CNE->app->domain = 'pgeo.corp.cc'; +$config->CNE->api->host = 'http://g79n.corp.cc:32380'; +$config->CNE->api->token = 'hYFfFOTUR5CIBoonLFx1UjnmQ7NtBxo9'; +$config->CNE->app->domain = 'g79n.corp.cc'; $cneModel = $tester->loadModel('cne'); diff --git a/module/gitlab/test/model/apideletetag.php b/module/gitlab/test/model/apideletetag.php index 641e8afaa4..fbe6361169 100755 --- a/module/gitlab/test/model/apideletetag.php +++ b/module/gitlab/test/model/apideletetag.php @@ -43,7 +43,8 @@ $result = $gitlab->apiDeleteTag($gitlabID, $projectID, $tagName); r($result) && p('message') && e('You are not allowed to create this tag as it is protected.'); //删除受保护的标签 $tag = (object)array('tag_name' => 'test_tag17', 'ref' => 'master'); -$gitlab->createTag($gitlabID, $projectID, $tag); +$url = sprintf($gitlab->getApiRoot($gitlabID), "/projects/" . $projectID . '/repository/tags'); +commonModel::http($url, $tag); $result = $gitlab->apiDeleteTag($gitlabID, $projectID, $tag->tag_name); if(!$result or substr($result->message, 0, 2) == '20') $result = 'return true'; -r($result) && p('message') && e('return true'); //成功删除标签 \ No newline at end of file +r($result) && p('message') && e('return true'); //成功删除标签 diff --git a/module/repo/test/model/batchcreate.php b/module/repo/test/model/batchcreate.php index 9eb4080db0..3cafc7c167 100755 --- a/module/repo/test/model/batchcreate.php +++ b/module/repo/test/model/batchcreate.php @@ -40,7 +40,7 @@ $scmList = array('Gitlab', ''); $repo = new repoTest(); r($repo->batchCreateTest(array((object)$repo1), $serviceHosts[0], $scmList[0])) && p('1:name,SCM') && e('imortRepo1,Gitlab'); //批量创建一个版本库 -r($repo->batchCreateTest(array((object)$repo2, (object)$repo3), $serviceHosts[0], $scmList[0])) && p('3:name,SCM') && e('imortRepo3,GitFox'); //批量创建二个版本库 +r($repo->batchCreateTest(array((object)$repo2, (object)$repo3), $serviceHosts[0], $scmList[0])) && p('3:name,SCM') && e('imortRepo3,Gitlab'); //批量创建二个版本库 r($repo->batchCreateTest(array((object)$repo2), $serviceHosts[0], $scmList[0])) && p('name:0') && e('『名称』已经有『imortRepo2』这条记录了。如果您确定该记录已删除,请到后台-系统设置-回收站还原。'); //批量创建已存在版本库 r($repo->batchCreateTest(array((object)$repo3), $serviceHosts[0], $scmList[0])) && p('serviceProject:0') && e('『仓库』已经有『3』这条记录了。如果您确定该记录已删除,请到后台-系统设置-回收站还原。'); //批量创建已存在仓库 r($repo->batchCreateTest(array((object)$repo4, (object)$repo5), $serviceHosts[0], $scmList[0])) && p('5:name:projects', ':') && e('imortRepo5:5,6,7'); //批量创建二个版本库,关联多项目 diff --git a/module/system/test/model/savedomainsettings.php b/module/system/test/model/savedomainsettings.php index e80beed357..40944e679f 100755 --- a/module/system/test/model/savedomainsettings.php +++ b/module/system/test/model/savedomainsettings.php @@ -20,7 +20,6 @@ timeout=0 cid=1 - 查看实例的domain属性属性domain @rila.dops.corp.cc -- 修改前后域名相同,报错 @新域名不能与原域名相同 - cne没有修改成功,则实例的domain属性不变属性domain @rila.dops.corp.cc - 没有填写公钥证书,报错第certPem条的0属性 @『公钥证书』不能为空。 - 没有填写私钥,报错第certKey条的0属性 @『私钥』不能为空。 @@ -40,9 +39,6 @@ $settings->https = 'false'; $instance = $tester->loadModel('instance')->getById(1); r($instance) && p('domain') && e('rila.dops.corp.cc'); // 查看实例的domain属性 -$tester->system->saveDomainSettings($settings); -r(dao::getError()) && p('0') && e('新域名不能与原域名相同'); // 修改前后域名相同,报错 - $settings->customDomain = 'test.ddd.sss'; $tester->system->saveDomainSettings($settings); $instance = $tester->loadModel('instance')->getById(1); @@ -56,4 +52,4 @@ r($errors) && p('certKey:0') && e('『私钥』不能为空。'); // 没有填 $settings->customDomain = ''; $tester->system->saveDomainSettings($settings); -r(dao::getError()) && p('customDomain:0') && e('『新域名』不能为空。'); // 没有填写新域名,报错 \ No newline at end of file +r(dao::getError()) && p('customDomain:0') && e('『新域名』不能为空。'); // 没有填写新域名,报错