From 07d323f0e6c17dc84c86e86edf0562b2d6c6968b Mon Sep 17 00:00:00 2001 From: deadc0de6 Date: Thu, 4 Jan 2024 22:15:37 +0100 Subject: [PATCH] fix tests --- tests-ng/assets/generate.sh | 23 ++++++++++++++++++ tests-ng/assets/github.catalog.csv.txt | 11 +++++---- tests-ng/assets/github.catalog.json | 29 ++++++++++++++--------- tests-ng/assets/github.catalog.native.txt | 7 +++--- tests-ng/compare.sh | 8 ++++--- tests-ng/find.sh | 3 ++- tests-ng/update.sh | 3 ++- 7 files changed, 60 insertions(+), 24 deletions(-) create mode 100755 tests-ng/assets/generate.sh diff --git a/tests-ng/assets/generate.sh b/tests-ng/assets/generate.sh new file mode 100755 index 0000000..4923566 --- /dev/null +++ b/tests-ng/assets/generate.sh @@ -0,0 +1,23 @@ +#!/usr/bin/env bash +# run me from the root of the package + +source tests-ng/helper + + +rm -f tests-ng/assets/github.catalog.json +python3 -m catcli.catcli index -c github .github --catalog=tests-ng/assets/github.catalog.json + +# edit catalog +sed -i 's/"free": .*,/"free": 0,/g' "tests-ng/assets/github.catalog.json" +sed -i 's/"total": .*,/"total": 0,/g' "tests-ng/assets/github.catalog.json" + +# native +python3 -m catcli.catcli ls -r -s -B --catalog=tests-ng/assets/github.catalog.json | \ + sed -e 's/free:.*%/free:0.0%/g' \ + -e 's/date:....-..-.. ..:..:../date:2023-03-09 16:20:59/g' \ + -e 's#du:[^|]* |#du:0/0 |#g' > tests-ng/assets/github.catalog.native.txt + +# csv +python3 -m catcli.catcli ls -r -s -B --catalog=tests-ng/assets/github.catalog.json --format=csv | \ + sed -e 's/"3","[^"]*","[^"]*",""/"3","0","0",""/g' | \ + sed 's/20..-..-.. ..:..:..//g' > tests-ng/assets/github.catalog.csv.txt \ No newline at end of file diff --git a/tests-ng/assets/github.catalog.csv.txt b/tests-ng/assets/github.catalog.csv.txt index 9d7e3b4..9333720 100644 --- a/tests-ng/assets/github.catalog.csv.txt +++ b/tests-ng/assets/github.catalog.csv.txt @@ -1,5 +1,6 @@ -"github","storage","","1510","2023-03-09 16:20:59","","","2","0","0","" -"workflows","dir","github/workflows","1493","2023-03-09 16:20:59","2023-03-09 16:20:44","","2","","","" -"pypi-release.yml","file","github/workflows/pypi-release.yml","691","2023-03-09 16:20:59","2022-10-19 21:00:37","57699a7a6a03e20e864f220e19f8e197","","","","" -"testing.yml","file","github/workflows/testing.yml","802","2023-03-09 16:20:59","2023-03-09 16:20:44","7144a119ef43adb634654522c12ec250","","","","" -"FUNDING.yml","file","github/FUNDING.yml","17","2023-03-09 16:20:59","2022-10-19 21:00:37","0c6407a84d412c514007313fb3bca4de","","","","" +"github","storage","","1642","","","","3","0","0","" +"workflows","dir","github/workflows","1521","","","","2","","","" +"pypi-release.yml","file","github/workflows/pypi-release.yml","691","","","57699a7a6a03e20e864f220e19f8e197","","","","" +"testing.yml","file","github/workflows/testing.yml","830","","","93c53fc77c983b4686c8971aa25b6b18","","","","" +"codecov.yml","file","github/codecov.yml","104","","","4203204f75b43cd4bf032402beb3359d","","","","" +"FUNDING.yml","file","github/FUNDING.yml","17","","","0c6407a84d412c514007313fb3bca4de","","","","" diff --git a/tests-ng/assets/github.catalog.json b/tests-ng/assets/github.catalog.json index 4a13008..c2d31ea 100644 --- a/tests-ng/assets/github.catalog.json +++ b/tests-ng/assets/github.catalog.json @@ -10,6 +10,13 @@ "size": 17, "type": "file" }, + { + "maccess": 1704320710.7056112, + "md5": "4203204f75b43cd4bf032402beb3359d", + "name": "codecov.yml", + "size": 104, + "type": "file" + }, { "children": [ { @@ -20,32 +27,32 @@ "type": "file" }, { - "maccess": 1678375244.4870229, - "md5": "7144a119ef43adb634654522c12ec250", + "maccess": 1704320754.2561862, + "md5": "93c53fc77c983b4686c8971aa25b6b18", "name": "testing.yml", - "size": 802, + "size": 830, "type": "file" } ], - "maccess": 1678375244.4865956, + "maccess": 1704320727.2641916, "name": "workflows", - "size": 1493, + "size": 1521, "type": "dir" } ], "free": 0, "name": "github", - "size": 1510, + "size": 1642, "total": 0, - "ts": 1678375259, + "ts": 1704402832, "type": "storage" }, { "attr": { - "access": 1678375259, - "access_version": "0.8.7", - "created": 1678375259, - "created_version": "0.8.7" + "access": 1704402832, + "access_version": "0.9.6", + "created": 1704402832, + "created_version": "0.9.6" }, "name": "meta", "type": "meta" diff --git a/tests-ng/assets/github.catalog.native.txt b/tests-ng/assets/github.catalog.native.txt index 14a0d42..16ee224 100644 --- a/tests-ng/assets/github.catalog.native.txt +++ b/tests-ng/assets/github.catalog.native.txt @@ -1,7 +1,8 @@ top └── storage: github - nbfiles:2 | totsize:1510 | free:0.0% | du:0/0 | date:2023-03-09 16:20:59 - ├── workflows [nbfiles:2, totsize:1493] + nbfiles:3 | totsize:1642 | free:0.0% | du:0/0 | date:2023-03-09 16:20:59 + ├── workflows [nbfiles:2, totsize:1521] │ ├── pypi-release.yml [size:691, md5:57699a7a6a03e20e864f220e19f8e197] - │ └── testing.yml [size:802, md5:7144a119ef43adb634654522c12ec250] + │ └── testing.yml [size:830, md5:93c53fc77c983b4686c8971aa25b6b18] + ├── codecov.yml [size:104, md5:4203204f75b43cd4bf032402beb3359d] └── FUNDING.yml [size:17, md5:0c6407a84d412c514007313fb3bca4de] diff --git a/tests-ng/compare.sh b/tests-ng/compare.sh index c7a68b3..4cafd42 100755 --- a/tests-ng/compare.sh +++ b/tests-ng/compare.sh @@ -10,7 +10,8 @@ cd "${prev}" # coverage bin="python3 -m catcli.catcli" if command -v coverage 2>/dev/null; then - bin="coverage run -p --source=catcli -m catcli.catcli" + mkdir -p coverages/ + bin="coverage run -p --data-file coverages/coverage --source=catcli -m catcli.catcli" fi echo "current dir: $(pwd)" @@ -114,13 +115,14 @@ csv="${tmpd}/csv.txt" ${bin} -B ls -s -r --format=csv --catalog="${catalog}" > "${csv}" # modify created csv mod="${tmpd}/csv.mod.txt" -cat "${csv}" | sed -e 's/"2","[^"]*","[^"]*",""/"2","0","0",""/g' | \ +cat "${csv}" | \ + sed -e 's/"3","[^"]*","[^"]*",""/"3","0","0",""/g' | \ sed 's/20..-..-.. ..:..:..//g' > "${mod}" # modify original ori="${tmpd}/ori.mod.txt" cat "tests-ng/assets/github.catalog.csv.txt" | \ sed 's/....-..-.. ..:..:..//g' | \ - sed 's/"2","[^"]*","[^"]*",""/"2","0","0",""/g' > "${ori}" + sed 's/"3","[^"]*","[^"]*",""/"3","0","0",""/g' > "${ori}" if command -v delta >/dev/null; then delta -s "${ori}" "${mod}" fi diff --git a/tests-ng/find.sh b/tests-ng/find.sh index 887e57b..34a2d1c 100755 --- a/tests-ng/find.sh +++ b/tests-ng/find.sh @@ -10,7 +10,8 @@ cd "${prev}" # coverage bin="python3 -m catcli.catcli" if command -v coverage 2>/dev/null; then - bin="coverage run -p --source=catcli -m catcli.catcli" + mkdir -p coverages/ + bin="coverage run -p --data-file coverages/coverage --source=catcli -m catcli.catcli" fi echo "current dir: $(pwd)" diff --git a/tests-ng/update.sh b/tests-ng/update.sh index 8a93892..d07eec6 100755 --- a/tests-ng/update.sh +++ b/tests-ng/update.sh @@ -10,7 +10,8 @@ cd "${prev}" # coverage bin="python3 -m catcli.catcli" if command -v coverage 2>/dev/null; then - bin="coverage run -p --source=catcli -m catcli.catcli" + mkdir -p coverages/ + bin="coverage run -p --data-file coverages/coverage --source=catcli -m catcli.catcli" fi echo "current dir: $(pwd)"