>From afc3fcb7f2e31dcd4f6c62386d3d168240d8c0d4 Mon Sep 17 00:00:00 2001
From: Tomas Hozza <address@hidden>
Date: Thu, 7 Nov 2019 13:11:30 +0100
Subject: [PATCH 3/5] testenv: Add test for handling of no_proxy environment
 variable

Added new test with 5 cases, which are testing various combinations of no_proxy environment variable definition and requested URLs

Signed-off-by: Tomas Hozza <address@hidden>
---
 testenv/Test-no_proxy-env.py | 131 +++++++++++++++++++++++++++++++++++
 1 file changed, 131 insertions(+)
 create mode 100755 testenv/Test-no_proxy-env.py

diff --git a/testenv/Test-no_proxy-env.py b/testenv/Test-no_proxy-env.py
new file mode 100755
index 00000000..5afce505
--- /dev/null
+++ b/testenv/Test-no_proxy-env.py
@@ -0,0 +1,131 @@
+#!/usr/bin/env python3
+from sys import exit
+from test.http_test import HTTPTest
+from test.base_test import HTTP
+from misc.wget_file import WgetFile
+
+"""
+    This test ensures, that domains with and without leftmost dot defined in
+    no_proxy environment variable are accepted by wget. The idea is to use
+    non-existing proxy server address and detect whether files are downloaded
+    when proxy settings are omitted based on no_proxy environment variable
+    value.
+"""
+# File Definitions
+File1 = "Would you like some Tea?"
+File2 = "With lemon or cream?"
+
+A_File = WgetFile ("File1", File1)
+B_File = WgetFile ("File2", File2)
+
+WGET_URLS = [["File1", "File2"]]
+WGET_ENVS = {
+    "http_proxy": "nonexisting.localhost:8080",
+    "no_proxy": "working1.localhost,.working2.localhost"
+}
+
+Servers = [HTTP]
+Files = [[A_File, B_File]]
+
+ExpectedReturnCodeWorking = 0
+ExpectedReturnCodeNotWorking = 4  # network error (non-existing proxy address)
+
+ExpectedDownloadedFilesWorking = [A_File, B_File]
+
+# Pre and Post Test Hooks
+test_options = {
+    "Urls"                : WGET_URLS,
+    "EnvironmentVariables": WGET_ENVS
+}
+post_test_working = {
+    "ExpectedFiles"     : ExpectedDownloadedFilesWorking,
+    "ExpectedRetcode"   : ExpectedReturnCodeWorking
+}
+post_test_not_working = {
+    "ExpectedRetcode"   : ExpectedReturnCodeNotWorking
+}
+
+# Case #1:
+# - Requested domain matches exactly the domain definition in no_proxy.
+# - Domain definition in no_proxy is NOT dot-prefixed
+# Expected result: proxy settings don't apply and files are downloaded.
+pre_test_working1 = {
+    "ServerFiles"       : Files,
+    "Domains"           : ["working1.localhost"]
+}
+
+err_case_1 = HTTPTest (
+    pre_hook=pre_test_working1,
+    test_params=test_options,
+    post_hook=post_test_working,
+    protocols=Servers
+).begin ()
+
+# Case #2:
+# - Requested domain is sub-domain of a domain definition in no_proxy.
+# - Domain definition in no_proxy is NOT dot-prefixed
+# Expected result: proxy settings don't apply and files are downloaded.
+pre_test_working2 = {
+    "ServerFiles"       : Files,
+    "Domains"           : ["www.working1.localhost"]
+}
+
+err_case_2 = HTTPTest (
+    pre_hook=pre_test_working2,
+    test_params=test_options,
+    post_hook=post_test_working,
+    protocols=Servers
+).begin ()
+
+# Case #3:
+# - Requested domain matches exactly the domain definition in no_proxy,
+#   except for the leftmost dot (".") in no_proxy domain definition.
+# - Domain definition in no_proxy IS dot-prefixed
+# Expected result: proxy settings don't apply and files are downloaded.
+pre_test_working3 = {
+    "ServerFiles"       : Files,
+    "Domains"           : ["working2.localhost"]
+}
+
+err_case_3 = HTTPTest (
+    pre_hook=pre_test_working3,
+    test_params=test_options,
+    post_hook=post_test_working,
+    protocols=Servers
+).begin ()
+
+# Case #4:
+# - Requested domain is sub-domain of a domain definition in no_proxy.
+# - Domain definition in no_proxy IS dot-prefixed
+# Expected result: proxy settings don't apply and files are downloaded.
+pre_test_working4 = {
+    "ServerFiles"       : Files,
+    "Domains"           : ["www.working2.localhost"]
+}
+
+err_case_4 = HTTPTest (
+    pre_hook=pre_test_working4,
+    test_params=test_options,
+    post_hook=post_test_working,
+    protocols=Servers
+).begin ()
+
+# Case #5
+# - Requested domain does not match a domain definition in no_proxy.
+# - Requested domain is NOT sub-domain of a domain definition in no_proxy.
+# Expected result: proxy settings apply and files are NOT downloaded due to
+#                  network error when using proxy with non-existing URL.
+pre_test_not_working1 = {
+    "ServerFiles"       : Files,
+    "Domains"           : ["www.example.localhost"]
+}
+
+err_case_5 = HTTPTest (
+    pre_hook=pre_test_not_working1,
+    test_params=test_options,
+    post_hook=post_test_not_working,
+    protocols=Servers
+).begin ()
+
+# Combine error codes from all test cases
+exit (max(err_case_1, err_case_2, err_case_3, err_case_4, err_case_5))
-- 
2.21.0