Fix some unit tests.

Signed-off-by: Thomas Neidhart <thomas.neidhart@gmail.com>

Author: netomi

tests/data/setup/simple-setup.py-expected.json

@@ -139,67 +139,6 @@
       "datasource_id": null,
       "purl": "pkg:pypi/boolean-py@3.8"
     },
-    {
-      "type": "pypi",
-      "namespace": null,
-      "name": "boolean-py",
-      "version": "3.8",
-      "qualifiers": {},
-      "subpath": null,
-      "primary_language": "Python",
-      "description": "Define boolean algebras, create and parse boolean expressions and create custom boolean DSL.\nThis library helps you deal with boolean expressions and algebra with variables\nand the boolean functions AND, OR, NOT.\n\nYou can parse expressions from strings and simplify and compare expressions.\nYou can also easily create your custom algreba and mini DSL and create custom\ntokenizers to handle custom expressions.\n\nFor extensive documentation look either into the docs directory or view it online, at\nhttps://booleanpy.readthedocs.org/en/latest/\n\nhttps://github.com/bastikr/boolean.py\n\nCopyright (c) 2009-2020 Sebastian Kraemer, basti.kr@gmail.com and others\nSPDX-License-Identifier: BSD-2-Clause",
-      "release_date": "2020-06-10T22:06:07",
-      "parties": [
-        {
-          "type": "person",
-          "role": "author",
-          "name": "Sebastian Kraemer",
-          "email": "basti.kr@gmail.com",
-          "url": null
-        }
-      ],
-      "keywords": [
-        "boolean expression",
-        "boolean algebra",
-        "logic",
-        "expression parser",
-        "Development Status :: 5 - Production/Stable",
-        "Intended Audience :: Developers",
-        "Operating System :: OS Independent",
-        "Programming Language :: Python",
-        "Programming Language :: Python :: 2.7",
-        "Programming Language :: Python :: 3",
-        "Topic :: Scientific/Engineering :: Mathematics",
-        "Topic :: Software Development :: Compilers",
-        "Topic :: Software Development :: Libraries",
-        "Topic :: Utilities"
-      ],
-      "homepage_url": "https://github.com/bastikr/boolean.py",
-      "download_url": "https://files.pythonhosted.org/packages/a1/eb/b37ef5647243ade8308f7bb46b1a45e6204790c163cbd8cf6df990d5c1c1/boolean.py-3.8.tar.gz",
-      "size": 32196,
-      "sha1": null,
-      "md5": "83ccc145ba74a585637124c8bc648333",
-      "sha256": "cc24e20f985d60cd4a3a5a1c0956dd12611159d32a75081dabd0c9ab981acaa4",
-      "sha512": null,
-      "bug_tracking_url": null,
-      "code_view_url": null,
-      "vcs_url": null,
-      "copyright": null,
-      "license_expression": null,
-      "declared_license": {
-        "license": "BSD-2-Clause"
-      },
-      "notice_text": null,
-      "source_packages": [],
-      "file_references": [],
-      "extra_data": {},
-      "dependencies": [],
-      "repository_homepage_url": null,
-      "repository_download_url": null,
-      "api_data_url": "https://pypi.org/pypi/boolean-py/3.8/json",
-      "datasource_id": null,
-      "purl": "pkg:pypi/boolean-py@3.8"
-    },
     {
       "type": "pypi",
       "namespace": null,
@@ -268,75 +207,6 @@
       "api_data_url": "https://pypi.org/pypi/license-expression/1.0/json",
       "datasource_id": null,
       "purl": "pkg:pypi/license-expression@1.0"
-    },
-    {
-      "type": "pypi",
-      "namespace": null,
-      "name": "license-expression",
-      "version": "1.0",
-      "qualifiers": {},
-      "subpath": null,
-      "primary_language": "Python",
-      "description": "license-expression is small utility library to parse, compare, simplify and normalize license expressions (such as SPDX license expressions) using boolean logic.",
-      "release_date": "2019-10-16T17:48:47",
-      "parties": [
-        {
-          "type": "person",
-          "role": "author",
-          "name": "nexB Inc.",
-          "email": "info@nexb.com",
-          "url": null
-        }
-      ],
-      "keywords": [
-        "license",
-        "spdx",
-        "license expression",
-        "open source",
-        "boolean",
-        "parse expression",
-        "normalize expression",
-        "compare expression",
-        "licence",
-        "Development Status :: 5 - Production/Stable",
-        "Intended Audience :: Developers",
-        "Operating System :: OS Independent",
-        "Programming Language :: Python",
-        "Programming Language :: Python :: 2",
-        "Programming Language :: Python :: 2.7",
-        "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.4",
-        "Programming Language :: Python :: 3.5",
-        "Topic :: Utilities"
-      ],
-      "homepage_url": "https://github.com/nexB/license-expression",
-      "download_url": "https://files.pythonhosted.org/packages/27/71/a8d8d78f7866a75f6a940cc53d1557a5edf1ae4a281fe8797cf36077105d/license-expression-1.0.tar.gz",
-      "size": 53559,
-      "sha1": null,
-      "md5": "81477f779099f55071c6a7b88a29bb01",
-      "sha256": "8aaa455c5b97c4f2174090178b19792b2a1c620e80591aafd4e0a99b713f9e8d",
-      "sha512": null,
-      "bug_tracking_url": null,
-      "code_view_url": null,
-      "vcs_url": null,
-      "copyright": null,
-      "license_expression": null,
-      "declared_license": {
-        "license": "apache-2.0",
-        "classifiers": [
-          "License :: OSI Approved :: Apache Software License"
-        ]
-      },
-      "notice_text": null,
-      "source_packages": [],
-      "file_references": [],
-      "extra_data": {},
-      "dependencies": [],
-      "repository_homepage_url": null,
-      "repository_download_url": null,
-      "api_data_url": "https://pypi.org/pypi/license-expression/1.0/json",
-      "datasource_id": null,
-      "purl": "pkg:pypi/license-expression@1.0"
     }
   ],
   "resolved_dependencies_graph": [

tests/test_utils.py

@@ -53,7 +53,7 @@ def test_get_netrc_auth_with_no_matching_url():
 async def test_fetch_links(mock_get):
     file_name = test_env.get_test_loc("psycopg2.html")
     with open(file_name) as file:
-        mock_get.return_value = file.read()
+        mock_get.return_value = file.read(), file_name
     links = await PypiSimpleRepository().fetch_links(normalized_name="psycopg2")
     result_file = test_env.get_temp_file("json")
     expected_file = test_env.get_test_loc("psycopg2-links-expected.json", must_exist=False)
@@ -63,7 +63,7 @@ async def test_fetch_links(mock_get):
     # Testing relative links
     relative_links_file = test_env.get_test_loc("fetch_links_test.html")
     with open(relative_links_file) as relative_file:
-        mock_get.return_value = relative_file.read()
+        mock_get.return_value = relative_file.read(), relative_links_file
     relative_links = await PypiSimpleRepository().fetch_links(normalized_name="sources.whl")
     relative_links_result_file = test_env.get_temp_file("json")
     relative_links_expected_file = test_env.get_test_loc(