Skip to content

Commit

Permalink
fix: 修复了一些已知问题;
Browse files Browse the repository at this point in the history
Description:

Log:
  • Loading branch information
mikigo committed Dec 13, 2023
1 parent 37e2b3e commit a0079f3
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 11 deletions.
2 changes: 1 addition & 1 deletion CURRENT
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[current]
tag = 2.3.5
tag = 2.3.6
9 changes: 5 additions & 4 deletions RELEASE.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# 版本更新记录

## 2.3.6(dev
## 2.3.6(2023/12/13

**New**

- 标签化管理支持判断系统版本跳过用例,用 `/etc/os-version` 里面的 `MinorVersion` 字段作为判断依据,在 `setting/skipif.py` 插件中实现了此功能,后续在 `CSV` 文件中可以使用此方法进行条件跳过;
- 标签化管理支持判断系统版本跳过用例,用 `/etc/os-version` 里面的 `MinorVersion` 字段作为判断依据,在 `setting/skipif.py` 插件中实现了此功能,后续在 `CSV` 文件中可以使用此方法进行条件跳过;[# issues 16](https://github.com/linuxdeepin/deepin-autotest-framework/issues/16)

```python hl_lines="57-67"
--8<-- "setting/skipif.py"
Expand All @@ -13,9 +13,10 @@
**Fix**

- 修改 `public` 目录权限为 `umask 022`,以解决远程开发时无法同步文件的问题;
- 修复 `Wayland` 下系统监视器使用 `WaylandWindowINfo.window_info()`,获取的窗口名称为空;
- 解除 `env.sh` 中某个 `deb` 包安装失败后替换源 `retry` 机制,因为用固定的源替换之后,容易出现某些包安装失败,而不容易关注到首次包安装失败的问题,给定位环境安装失败带来困难;
- 修复 `Wayland` 下系统监视器使用 `WaylandWindowINfo.window_info()`,获取的窗口名称为空;[# issues 18](https://github.com/linuxdeepin/deepin-autotest-framework/issues/20)
- 解除 `env.sh` 中某个 `deb` 包安装失败后替换源 `retry` 机制,因为用固定的源替换之后,容易出现某些包安装失败,而不容易关注到首次包安装失败的问题,给定位环境安装失败带来困难;[# issues 19](https://github.com/linuxdeepin/deepin-autotest-framework/issues/19)
- 修复 `env.sh` 里面报错 `ERROR: unknown command "cache" - maybe you meant "check"`
- 修复用例收集数量为 `0` 时,报错 `ci_result.json` 文件找不到;[# issues 20](https://github.com/linuxdeepin/deepin-autotest-framework/issues/20)

## 2.3.5(2023/12/04)

Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "hatchling.build"

[project]
name = "youqu"
version = "2.3.5"
version = "2.3.6"
authors = [
{ name = "mikigo", email = "[email protected]" },
]
Expand Down
13 changes: 8 additions & 5 deletions src/rtk/local_runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -406,13 +406,13 @@ def local_run(self):
copy_to=f"{GlobalConfig.REPORT_PATH}/_running_man_{GlobalConfig.TIME_STRING}.log"
)

@staticmethod
def get_result():
@classmethod
def get_result(cls, ci_result):
"""
获取结果
:return:
"""
with open(f"{GlobalConfig.ROOT_DIR}/ci_result.json", "r", encoding="utf-8") as _f:
with open(ci_result, "r", encoding="utf-8") as _f:
results_dict = json.load(_f)
res = Counter([results_dict.get(i).get("result") for i in results_dict])
total = sum(res.values())
Expand All @@ -439,7 +439,6 @@ def write_json(cls, project_name=None, build_location=None, line=None):
}
"""
json_tpl_path = f"{GlobalConfig.SETTING_PATH}/template/ci.json"

if not exists(json_tpl_path):
raise FileNotFoundError
with open(json_tpl_path, "r", encoding="utf-8") as _f:
Expand All @@ -448,12 +447,16 @@ def write_json(cls, project_name=None, build_location=None, line=None):
results["project_name"] = project_name
results["build_location"] = build_location
results["line"] = line
ci_result_path = f"{GlobalConfig.ROOT_DIR}/ci_result.json"
if not exists(ci_result_path):
return

(
results["total"],
results["fail"],
results["pass"],
results["pass_rate"],
) = cls.get_result()
) = cls.get_result(ci_result_path)

json_res_path = f"{GlobalConfig.ROOT_DIR}/{project_name}_at.json"
with open(json_res_path, "w+", encoding="utf-8") as _f:
Expand Down

0 comments on commit a0079f3

Please sign in to comment.