Skip to content

Commit 053e311

Browse files
JonoYangJonoYang
committed
Update test expectations #447
Signed-off-by: Jono Yang <[email protected]>
1 parent 69fb4e2 commit 053e311

12 files changed

+340
-327
lines changed

‎scanpipe/tests/data/alpine_3_15_4_scan_codebase.json

+39-39
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117
"code_view_url": "",
118118
"vcs_url": "git+http://git.alpinelinux.org/aports/commit/?id=dfa1379357a321e638feef1cd8d55ab03d020f45",
119119
"copyright": "",
120-
"license_expression": "",
120+
"license_expression": "gpl-2.0",
121121
"declared_license": "GPL-2.0-only",
122122
"notice_text": "",
123123
"manifest_path": "",
@@ -185,7 +185,7 @@
185185
"code_view_url": "",
186186
"vcs_url": "git+http://git.alpinelinux.org/aports/commit/?id=aab68f8c9ab434a46710de8e12fb3206e2930a59",
187187
"copyright": "",
188-
"license_expression": "",
188+
"license_expression": "mit",
189189
"declared_license": "MIT",
190190
"notice_text": "",
191191
"manifest_path": "",
@@ -373,7 +373,7 @@
373373
"code_view_url": "",
374374
"vcs_url": "git+http://git.alpinelinux.org/aports/commit/?id=1ac3c1bb29eeff083c621cf6b27ad12ab93cb73a",
375375
"copyright": "",
376-
"license_expression": "",
376+
"license_expression": "gpl-2.0",
377377
"declared_license": "GPL-2.0-only",
378378
"notice_text": "",
379379
"manifest_path": "",
@@ -406,7 +406,7 @@
406406
"code_view_url": "",
407407
"vcs_url": "git+http://git.alpinelinux.org/aports/commit/?id=2745de7e1b09e663b477a8141b84f7d81a049963",
408408
"copyright": "",
409-
"license_expression": "",
409+
"license_expression": "gpl-2.0",
410410
"declared_license": "GPL-2.0-only",
411411
"notice_text": "",
412412
"manifest_path": "",
@@ -450,7 +450,7 @@
450450
"code_view_url": "",
451451
"vcs_url": "git+http://git.alpinelinux.org/aports/commit/?id=709b70bcb72738cfedc510bba08141b012038167",
452452
"copyright": "",
453-
"license_expression": "",
453+
"license_expression": "mpl-2.0 AND mit",
454454
"declared_license": "MPL-2.0 AND MIT",
455455
"notice_text": "",
456456
"manifest_path": "",
@@ -494,7 +494,7 @@
494494
"code_view_url": "",
495495
"vcs_url": "git+http://git.alpinelinux.org/aports/commit/?id=455e966899a9358fc94f5bce633afe8a1942095c",
496496
"copyright": "",
497-
"license_expression": "",
497+
"license_expression": "openssl-ssleay",
498498
"declared_license": "OpenSSL",
499499
"notice_text": "",
500500
"manifest_path": "",
@@ -562,7 +562,7 @@
562562
"code_view_url": "",
563563
"vcs_url": "git+http://git.alpinelinux.org/aports/commit/?id=60424133be2e79bbfeff3d58147a22886f817ce2",
564564
"copyright": "",
565-
"license_expression": "",
565+
"license_expression": "bsd-simplified AND bsd-new",
566566
"declared_license": "BSD-2-Clause AND BSD-3-Clause",
567567
"notice_text": "",
568568
"manifest_path": "",
@@ -595,7 +595,7 @@
595595
"code_view_url": "",
596596
"vcs_url": "git+http://git.alpinelinux.org/aports/commit/?id=91c7a9f3aa296b6d462c5634e7658ebdbff65bb9",
597597
"copyright": "",
598-
"license_expression": "",
598+
"license_expression": "isc AND (bsd-new OR mit)",
599599
"declared_license": "ISC AND (BSD-3-Clause OR MIT)",
600600
"notice_text": "",
601601
"manifest_path": "",
@@ -639,7 +639,7 @@
639639
"code_view_url": "",
640640
"vcs_url": "git+http://git.alpinelinux.org/aports/commit/?id=455e966899a9358fc94f5bce633afe8a1942095c",
641641
"copyright": "",
642-
"license_expression": "",
642+
"license_expression": "openssl-ssleay",
643643
"declared_license": "OpenSSL",
644644
"notice_text": "",
645645
"manifest_path": "",
@@ -683,7 +683,7 @@
683683
"code_view_url": "",
684684
"vcs_url": "git+http://git.alpinelinux.org/aports/commit/?id=bf5bbfdbf780092f387b7abe401fbfceda90c84d",
685685
"copyright": "",
686-
"license_expression": "",
686+
"license_expression": "mit",
687687
"declared_license": "MIT",
688688
"notice_text": "",
689689
"manifest_path": "",
@@ -727,7 +727,7 @@
727727
"code_view_url": "",
728728
"vcs_url": "git+http://git.alpinelinux.org/aports/commit/?id=bf5bbfdbf780092f387b7abe401fbfceda90c84d",
729729
"copyright": "",
730-
"license_expression": "",
730+
"license_expression": "mit AND bsd-new AND gpl-2.0-plus",
731731
"declared_license": "MIT BSD GPL2+",
732732
"notice_text": "",
733733
"manifest_path": "",
@@ -760,7 +760,7 @@
760760
"code_view_url": "",
761761
"vcs_url": "git+http://git.alpinelinux.org/aports/commit/?id=86b3d4fbb0a760febf3476f9a58abf8d0f728d5c",
762762
"copyright": "",
763-
"license_expression": "",
763+
"license_expression": "gpl-2.0",
764764
"declared_license": "GPL-2.0-only",
765765
"notice_text": "",
766766
"manifest_path": "",
@@ -793,7 +793,7 @@
793793
"code_view_url": "",
794794
"vcs_url": "git+http://git.alpinelinux.org/aports/commit/?id=2745de7e1b09e663b477a8141b84f7d81a049963",
795795
"copyright": "",
796-
"license_expression": "",
796+
"license_expression": "gpl-2.0",
797797
"declared_license": "GPL-2.0-only",
798798
"notice_text": "",
799799
"manifest_path": "",
@@ -826,7 +826,7 @@
826826
"code_view_url": "",
827827
"vcs_url": "git+http://git.alpinelinux.org/aports/commit/?id=74148808679f47ad96dc99e83ef73acfdeec1642",
828828
"copyright": "",
829-
"license_expression": "",
829+
"license_expression": "zlib",
830830
"declared_license": "Zlib",
831831
"notice_text": "",
832832
"manifest_path": "",
@@ -1658,7 +1658,7 @@
16581658
"for_packages": [
16591659
"pkg:alpine/[email protected]?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758"
16601660
],
1661-
"path": "alpine_3_15_4.tar.gz-extract/40e48c8ef2450e6a9e8d50b846a58ede43f1b01dd351d2bdd7dca14c5c033f20/etc/profile.d/color_prompt.sh.disabled",
1661+
"path": "alpine_3_15_4.tar.gz-extract/40e48c8ef2450e6a9e8d50b846a58ede43f1b01dd351d2bdd7dca14c5c033f20/etc/profile.d/README",
16621662
"sha1": "",
16631663
"md5": "",
16641664
"extra_data": {},
@@ -1672,8 +1672,8 @@
16721672
"status": "system-package",
16731673
"tag": "img-06c7c4-layer-01-40e48c",
16741674
"type": "file",
1675-
"name": "color_prompt.sh.disabled",
1676-
"extension": ".disabled",
1675+
"name": "README",
1676+
"extension": "",
16771677
"programming_language": "",
16781678
"mime_type": "inode/x-empty",
16791679
"is_binary": false,
@@ -1687,7 +1687,7 @@
16871687
"for_packages": [
16881688
"pkg:alpine/[email protected]?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758"
16891689
],
1690-
"path": "alpine_3_15_4.tar.gz-extract/40e48c8ef2450e6a9e8d50b846a58ede43f1b01dd351d2bdd7dca14c5c033f20/etc/profile.d/locale.sh",
1690+
"path": "alpine_3_15_4.tar.gz-extract/40e48c8ef2450e6a9e8d50b846a58ede43f1b01dd351d2bdd7dca14c5c033f20/etc/profile.d/color_prompt.sh.disabled",
16911691
"sha1": "",
16921692
"md5": "",
16931693
"extra_data": {},
@@ -1701,9 +1701,9 @@
17011701
"status": "system-package",
17021702
"tag": "img-06c7c4-layer-01-40e48c",
17031703
"type": "file",
1704-
"name": "locale.sh",
1705-
"extension": ".sh",
1706-
"programming_language": "Bash",
1704+
"name": "color_prompt.sh.disabled",
1705+
"extension": ".disabled",
1706+
"programming_language": "",
17071707
"mime_type": "inode/x-empty",
17081708
"is_binary": false,
17091709
"is_text": true,
@@ -1716,7 +1716,7 @@
17161716
"for_packages": [
17171717
"pkg:alpine/[email protected]?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758"
17181718
],
1719-
"path": "alpine_3_15_4.tar.gz-extract/40e48c8ef2450e6a9e8d50b846a58ede43f1b01dd351d2bdd7dca14c5c033f20/etc/profile.d/README",
1719+
"path": "alpine_3_15_4.tar.gz-extract/40e48c8ef2450e6a9e8d50b846a58ede43f1b01dd351d2bdd7dca14c5c033f20/etc/profile.d/locale.sh",
17201720
"sha1": "",
17211721
"md5": "",
17221722
"extra_data": {},
@@ -1730,9 +1730,9 @@
17301730
"status": "system-package",
17311731
"tag": "img-06c7c4-layer-01-40e48c",
17321732
"type": "file",
1733-
"name": "README",
1734-
"extension": "",
1735-
"programming_language": "",
1733+
"name": "locale.sh",
1734+
"extension": ".sh",
1735+
"programming_language": "Bash",
17361736
"mime_type": "inode/x-empty",
17371737
"is_binary": false,
17381738
"is_text": true,
@@ -1888,9 +1888,9 @@
18881888
},
18891889
{
18901890
"for_packages": [
1891-
"pkg:alpine/[email protected]-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758"
1891+
"pkg:alpine/ca-certificates-bundle@20211220-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758"
18921892
],
1893-
"path": "alpine_3_15_4.tar.gz-extract/40e48c8ef2450e6a9e8d50b846a58ede43f1b01dd351d2bdd7dca14c5c033f20/etc/ssl1.1/ct_log_list.cnf.dist",
1893+
"path": "alpine_3_15_4.tar.gz-extract/40e48c8ef2450e6a9e8d50b846a58ede43f1b01dd351d2bdd7dca14c5c033f20/etc/ssl/certs/ca-certificates.crt",
18941894
"sha1": "",
18951895
"md5": "",
18961896
"extra_data": {},
@@ -1904,8 +1904,8 @@
19041904
"status": "system-package",
19051905
"tag": "img-06c7c4-layer-01-40e48c",
19061906
"type": "file",
1907-
"name": "ct_log_list.cnf.dist",
1908-
"extension": ".dist",
1907+
"name": "ca-certificates.crt",
1908+
"extension": ".crt",
19091909
"programming_language": "",
19101910
"mime_type": "inode/x-empty",
19111911
"is_binary": false,
@@ -1919,7 +1919,7 @@
19191919
"for_packages": [
19201920
"pkg:alpine/[email protected]?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758"
19211921
],
1922-
"path": "alpine_3_15_4.tar.gz-extract/40e48c8ef2450e6a9e8d50b846a58ede43f1b01dd351d2bdd7dca14c5c033f20/etc/ssl1.1/openssl.cnf",
1922+
"path": "alpine_3_15_4.tar.gz-extract/40e48c8ef2450e6a9e8d50b846a58ede43f1b01dd351d2bdd7dca14c5c033f20/etc/ssl1.1/ct_log_list.cnf.dist",
19231923
"sha1": "",
19241924
"md5": "",
19251925
"extra_data": {},
@@ -1933,8 +1933,8 @@
19331933
"status": "system-package",
19341934
"tag": "img-06c7c4-layer-01-40e48c",
19351935
"type": "file",
1936-
"name": "openssl.cnf",
1937-
"extension": ".cnf",
1936+
"name": "ct_log_list.cnf.dist",
1937+
"extension": ".dist",
19381938
"programming_language": "",
19391939
"mime_type": "inode/x-empty",
19401940
"is_binary": false,
@@ -1948,7 +1948,7 @@
19481948
"for_packages": [
19491949
"pkg:alpine/[email protected]?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758"
19501950
],
1951-
"path": "alpine_3_15_4.tar.gz-extract/40e48c8ef2450e6a9e8d50b846a58ede43f1b01dd351d2bdd7dca14c5c033f20/etc/ssl1.1/openssl.cnf.dist",
1951+
"path": "alpine_3_15_4.tar.gz-extract/40e48c8ef2450e6a9e8d50b846a58ede43f1b01dd351d2bdd7dca14c5c033f20/etc/ssl1.1/openssl.cnf",
19521952
"sha1": "",
19531953
"md5": "",
19541954
"extra_data": {},
@@ -1962,8 +1962,8 @@
19621962
"status": "system-package",
19631963
"tag": "img-06c7c4-layer-01-40e48c",
19641964
"type": "file",
1965-
"name": "openssl.cnf.dist",
1966-
"extension": ".dist",
1965+
"name": "openssl.cnf",
1966+
"extension": ".cnf",
19671967
"programming_language": "",
19681968
"mime_type": "inode/x-empty",
19691969
"is_binary": false,
@@ -1975,9 +1975,9 @@
19751975
},
19761976
{
19771977
"for_packages": [
1978-
"pkg:alpine/ca-certificates-bundle@20211220-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758"
1978+
"pkg:alpine/[email protected]-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758"
19791979
],
1980-
"path": "alpine_3_15_4.tar.gz-extract/40e48c8ef2450e6a9e8d50b846a58ede43f1b01dd351d2bdd7dca14c5c033f20/etc/ssl/certs/ca-certificates.crt",
1980+
"path": "alpine_3_15_4.tar.gz-extract/40e48c8ef2450e6a9e8d50b846a58ede43f1b01dd351d2bdd7dca14c5c033f20/etc/ssl1.1/openssl.cnf.dist",
19811981
"sha1": "",
19821982
"md5": "",
19831983
"extra_data": {},
@@ -1991,8 +1991,8 @@
19911991
"status": "system-package",
19921992
"tag": "img-06c7c4-layer-01-40e48c",
19931993
"type": "file",
1994-
"name": "ca-certificates.crt",
1995-
"extension": ".crt",
1994+
"name": "openssl.cnf.dist",
1995+
"extension": ".dist",
19961996
"programming_language": "",
19971997
"mime_type": "inode/x-empty",
19981998
"is_binary": false,

‎scanpipe/tests/data/asgiref-3.3.0_load_inventory_expected.json

+24-24
Original file line numberDiff line numberDiff line change
@@ -900,9 +900,9 @@
900900
},
901901
{
902902
"for_packages": [],
903-
"path": "asgiref-3.3.0-py3-none-any.whl-extract/asgiref-3.3.0.dist-info/top_level.txt",
904-
"sha1": "612390bd0d0227c009f9c99b479878adf7ac2f23",
905-
"md5": "680e61db4d95c8d9501b7a49fa2bf0b2",
903+
"path": "asgiref-3.3.0-py3-none-any.whl-extract/asgiref-3.3.0.dist-info/WHEEL",
904+
"sha1": "ddd91bc89b15fc5c66e0fa259392955c74ba041f",
905+
"md5": "5ccc7519eb42f1dfceee6e7d685f1ff5",
906906
"extra_data": {},
907907
"copyrights": [],
908908
"holders": [],
@@ -914,8 +914,8 @@
914914
"status": "",
915915
"tag": "",
916916
"type": "file",
917-
"name": "top_level.txt",
918-
"extension": ".txt",
917+
"name": "WHEEL",
918+
"extension": "",
919919
"programming_language": "",
920920
"mime_type": "text/plain",
921921
"is_binary": false,
@@ -927,9 +927,9 @@
927927
},
928928
{
929929
"for_packages": [],
930-
"path": "asgiref-3.3.0-py3-none-any.whl-extract/asgiref-3.3.0.dist-info/WHEEL",
931-
"sha1": "ddd91bc89b15fc5c66e0fa259392955c74ba041f",
932-
"md5": "5ccc7519eb42f1dfceee6e7d685f1ff5",
930+
"path": "asgiref-3.3.0-py3-none-any.whl-extract/asgiref-3.3.0.dist-info/top_level.txt",
931+
"sha1": "612390bd0d0227c009f9c99b479878adf7ac2f23",
932+
"md5": "680e61db4d95c8d9501b7a49fa2bf0b2",
933933
"extra_data": {},
934934
"copyrights": [],
935935
"holders": [],
@@ -941,8 +941,8 @@
941941
"status": "",
942942
"tag": "",
943943
"type": "file",
944-
"name": "WHEEL",
945-
"extension": "",
944+
"name": "top_level.txt",
945+
"extension": ".txt",
946946
"programming_language": "",
947947
"mime_type": "text/plain",
948948
"is_binary": false,
@@ -954,9 +954,9 @@
954954
},
955955
{
956956
"for_packages": [],
957-
"path": "asgiref-3.3.0-py3-none-any.whl-extract/asgiref/compatibility.py",
958-
"sha1": "9c74e64e9a71903bb227907ea1806eac77e52434",
959-
"md5": "5231077fd0628314246fcba7817b561e",
957+
"path": "asgiref-3.3.0-py3-none-any.whl-extract/asgiref/__init__.py",
958+
"sha1": "91bc786d907bf3ca8b8e6277063107975780f9ca",
959+
"md5": "4910b756f4e611055140e80f757d9325",
960960
"extra_data": {},
961961
"copyrights": [],
962962
"holders": [],
@@ -968,10 +968,10 @@
968968
"status": "",
969969
"tag": "",
970970
"type": "file",
971-
"name": "compatibility.py",
971+
"name": "__init__.py",
972972
"extension": ".py",
973973
"programming_language": "Python",
974-
"mime_type": "text/x-script.python",
974+
"mime_type": "text/plain",
975975
"is_binary": false,
976976
"is_text": true,
977977
"is_archive": false,
@@ -981,9 +981,9 @@
981981
},
982982
{
983983
"for_packages": [],
984-
"path": "asgiref-3.3.0-py3-none-any.whl-extract/asgiref/current_thread_executor.py",
985-
"sha1": "aacf7e5e2e5ba78ccfb67fa10e9e6b22c3935c9b",
986-
"md5": "b4c45f37055d88dd11b15eb4de51b074",
984+
"path": "asgiref-3.3.0-py3-none-any.whl-extract/asgiref/compatibility.py",
985+
"sha1": "9c74e64e9a71903bb227907ea1806eac77e52434",
986+
"md5": "5231077fd0628314246fcba7817b561e",
987987
"extra_data": {},
988988
"copyrights": [],
989989
"holders": [],
@@ -995,7 +995,7 @@
995995
"status": "",
996996
"tag": "",
997997
"type": "file",
998-
"name": "current_thread_executor.py",
998+
"name": "compatibility.py",
999999
"extension": ".py",
10001000
"programming_language": "Python",
10011001
"mime_type": "text/x-script.python",
@@ -1008,9 +1008,9 @@
10081008
},
10091009
{
10101010
"for_packages": [],
1011-
"path": "asgiref-3.3.0-py3-none-any.whl-extract/asgiref/__init__.py",
1012-
"sha1": "91bc786d907bf3ca8b8e6277063107975780f9ca",
1013-
"md5": "4910b756f4e611055140e80f757d9325",
1011+
"path": "asgiref-3.3.0-py3-none-any.whl-extract/asgiref/current_thread_executor.py",
1012+
"sha1": "aacf7e5e2e5ba78ccfb67fa10e9e6b22c3935c9b",
1013+
"md5": "b4c45f37055d88dd11b15eb4de51b074",
10141014
"extra_data": {},
10151015
"copyrights": [],
10161016
"holders": [],
@@ -1022,10 +1022,10 @@
10221022
"status": "",
10231023
"tag": "",
10241024
"type": "file",
1025-
"name": "__init__.py",
1025+
"name": "current_thread_executor.py",
10261026
"extension": ".py",
10271027
"programming_language": "Python",
1028-
"mime_type": "text/plain",
1028+
"mime_type": "text/x-script.python",
10291029
"is_binary": false,
10301030
"is_text": true,
10311031
"is_archive": false,

0 commit comments

Comments
 (0)