imp: tests

Author: Tardo

tests/test_privoxy.py

@@ -25,16 +25,23 @@ def test_https_no_verify(self, docker_privoxy, make_request):
         with pytest.raises(SSLError):
             make_request("https://google.com", use_privoxy_ca_bundle=False)
 
-    def test_adblock_filters(self, docker_privoxy, make_request):
+    def test_http_adblock_filters(self, docker_privoxy, make_request):
         resp = make_request("http://googie-anaiytics.com")
         assert self._is_blocked_by_privoxy(resp) == True
+
+    def test_https_adblock_filters(self, docker_privoxy, make_request):
         resp = make_request("https://googie-anaiytics.com")
         assert self._is_blocked_by_privoxy(resp) == True
 
-    def test_no_adblock_filters(self):
+    def test_http_no_adblock_filters(self):
         try:
             resp = requests.get("http://googie-anaiytics.com")
             assert self._is_blocked_by_privoxy(resp) == False
+        except ConnectionError:
+            pass  # 99% blocked by external software
+
+    def test_https_no_adblock_filters(self):
+        try:
             resp = requests.get("https://googie-anaiytics.com")
             assert self._is_blocked_by_privoxy(resp) == False
         except ConnectionError:
@@ -51,18 +58,26 @@ def test_https_adblock_css_filters(self, docker_privoxy, make_request, env_info)
         )
         assert resp.status_code == 200
 
-    def test_privman_blocklist(self, docker_privoxy, make_request, exec_privman):
+    def test_http_privman_blocklist(self, docker_privoxy, make_request, exec_privman):
         resp = exec_privman(docker_privoxy, "--add-blocklist", ".google.")
         assert "successfully" in resp
         time.sleep(3)
         resp = make_request("http://google.com")
         assert self._is_blocked_by_privoxy(resp) == True
-        resp = make_request("https://google.com")
-        assert self._is_blocked_by_privoxy(resp) == True
         resp = exec_privman(docker_privoxy, "--remove-blocklist", ".google.")
         assert "successfully" in resp
         time.sleep(3)
         resp = make_request("http://google.com")
         assert resp.status_code == 200
+
+    def test_https_privman_blocklist(self, docker_privoxy, make_request, exec_privman):
+        resp = exec_privman(docker_privoxy, "--add-blocklist", ".google.")
+        assert "successfully" in resp
+        time.sleep(3)
+        resp = make_request("https://google.com")
+        assert self._is_blocked_by_privoxy(resp) == True
+        resp = exec_privman(docker_privoxy, "--remove-blocklist", ".google.")
+        assert "successfully" in resp
+        time.sleep(3)
         resp = make_request("https://google.com")
         assert resp.status_code == 200