fix zlib and lighttpd long tests (#595)

* fixes #580
* fixes #552

Author: Niraj-Kamdar

test/test_scanner.py

@@ -1338,12 +1338,11 @@ def test_binaries(self, binary, package, version, are_in, not_in):
                         "lighttpd",
                         "1.4.54",
                     ),
-                    pytest.param(
-                        "https://download-ib01.fedoraproject.org/pub/epel/8/Everything/x86_64/Packages/l/",
-                        "lighttpd-1.4.55-1.el8.x86_64.rpm",
+                    (
+                        "https://download-ib01.fedoraproject.org/pub/fedora/linux/releases/31/Everything/x86_64/os/Packages/l/",
+                        "lighttpd-1.4.54-2.fc31.x86_64.rpm",
                         "lighttpd",
-                        "1.4.55",
-                        marks=pytest.mark.xfail(reason="File won't download on github"),
+                        "1.4.54",
                     ),
                     (
                         "https://ftp.lysator.liu.se/pub/opensuse/distribution/leap/15.1/repo/oss/x86_64/",
@@ -1525,12 +1524,12 @@ def test_binaries(self, binary, package, version, are_in, not_in):
                         "zlib",
                         "1.2.7",
                     ),
-                    # (
-                    #    "http://archive.ubuntu.com/ubuntu/pool/universe/z/zlib/",
-                    #    "zlib-bin_1.2.8.dfsg-1ubuntu1.1_amd64.deb",
-                    #    "zlib",
-                    #    "1.2.8",
-                    # ),
+                    (
+                        "http://archive.ubuntu.com/ubuntu/pool/main/z/zlib/",
+                        "zlib1g_1.2.8.dfsg-2ubuntu4_amd64.deb",
+                        "zlib",
+                        "1.2.8",
+                    ),
                 ],
                 list(
                     map(