From 9deed263d3bd53045fa3e03bacc75874ca0db419 Mon Sep 17 00:00:00 2001 From: deadc0de6 Date: Fri, 10 Mar 2023 23:01:36 +0100 Subject: [PATCH] compare --- tests-ng/assets/github.catalog.csv.txt | 6 +++--- tests-ng/assets/github.catalog.native.txt | 6 +++--- tests-ng/compare.sh | 14 ++++++++++++++ 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/tests-ng/assets/github.catalog.csv.txt b/tests-ng/assets/github.catalog.csv.txt index 07479cc..1108085 100644 --- a/tests-ng/assets/github.catalog.csv.txt +++ b/tests-ng/assets/github.catalog.csv.txt @@ -1,5 +1,5 @@ -"github","storage","","2380","2023-03-09 16:20:59","","","2","0","0","" -"workflows","dir","github/workflows","1190","2023-03-09 16:20:59","2023-03-09 16:20:44","","2","","","" +"github","storage","","2564","2023-03-09 16:20:59","","","2","0","0","" +"workflows","dir","github/workflows","1282","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","595","2023-03-09 16:20:59","2023-03-09 16:20:44","f4f4bc5acb9deae488b55f0c9c507120","","","","" +"testing.yml","file","github/workflows/testing.yml","641","2023-03-09 16:20:59","2023-03-09 16:20:44","941c01fa956b71133d6b5339824589b7","","","","" "FUNDING.yml","file","github/FUNDING.yml","17","2023-03-09 16:20:59","2022-10-19 21:00:37","0c6407a84d412c514007313fb3bca4de","","","","" diff --git a/tests-ng/assets/github.catalog.native.txt b/tests-ng/assets/github.catalog.native.txt index 8784024..d681b9b 100644 --- a/tests-ng/assets/github.catalog.native.txt +++ b/tests-ng/assets/github.catalog.native.txt @@ -1,7 +1,7 @@ top └── storage: github - nbfiles:2 | totsize:2380 | free:0.0% | du:0/0 | date:2023-03-09 16:20:59 - ├── workflows [nbfiles:2, totsize:1190] + nbfiles:2 | totsize:2564 | free:0.0% | du:0/0 | date:2023-03-09 16:20:59 + ├── workflows [nbfiles:2, totsize:1282] │ ├── pypi-release.yml [size:691, md5:57699a7a6a03e20e864f220e19f8e197] - │ └── testing.yml [size:595, md5:f4f4bc5acb9deae488b55f0c9c507120] + │ └── testing.yml [size:641, md5:941c01fa956b71133d6b5339824589b7] └── FUNDING.yml [size:17, md5:0c6407a84d412c514007313fb3bca4de] diff --git a/tests-ng/compare.sh b/tests-ng/compare.sh index aafa77f..3a92cdc 100755 --- a/tests-ng/compare.sh +++ b/tests-ng/compare.sh @@ -86,10 +86,24 @@ diff "${src_keys}" "${dst_keys}" # native native="${tmpd}/native.txt" ${bin} -B ls -s -r --format=native --catalog="${catalog}" > "${native}" +mod="${tmpd}/native.mod.txt" +cat "${native}" | 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' > "${mod}" +#delta "tests-ng/assets/github.catalog.native.txt" "${mod}" +diff --color=always "tests-ng/assets/github.catalog.native.txt" "${mod}" # csv csv="${tmpd}/csv.txt" ${bin} -B ls -s -r --format=csv --catalog="${catalog}" > "${csv}" +mod="${tmpd}/csv.mod.txt" +cat "${csv}" | sed -e 's/"2",".*",".*",""$/"2","0","0",""/g' | \ + sed 's/20..-..-.. ..:..:..//g' > "${mod}" +ori="${tmpd}/ori.mod.txt" +cat "tests-ng/assets/github.catalog.csv.txt" | \ + sed 's/20..-..-.. ..:..:..//g' > "${ori}" +#delta "${ori}" "${mod}" +diff "${ori}" "${mod}" # the end echo "test \"$(basename "$0")\" success"