Compatibility fix with multiple servers

We will not maintian two different interfaces as earlier decided.
Instead, a common, single interface will be maintained. Hence, the tests
must adhere to the same format expected of the Parallel Tests.

testenv/Test-Content-disposition-2.py

@@ -20,9 +20,9 @@ A_File = WgetFile ("HTTP.Teapot", File1)
 B_File = WgetFile ("File2", File2, rules=File2_rules)
 
 WGET_OPTIONS = "-d --content-disposition"
-WGET_URLS = ["File2"]
+WGET_URLS = [["File2"]]
 
-Files = [B_File]
+Files = [[B_File]]
 Existing_Files = [A_File]
 
 ExpectedReturnCode = 0

testenv/Test-Content-disposition.py

@@ -25,9 +25,9 @@ File1_rules = {
 A_File = WgetFile ("LOTR", File1, rules=File1_rules)
 
 WGET_OPTIONS = "-d --content-disposition"
-WGET_URLS = ["LOTR"]
+WGET_URLS = [["LOTR"]]
 
-Files = [A_File]
+Files = [[A_File]]
 
 ExpectedReturnCode = 0
 ExpectedDownloadedFiles = [WgetFile ("JRR.Tolkein", File1)]

testenv/Test-Head.py

@@ -13,9 +13,9 @@ File1 = "You shall not pass!"
 A_File = WgetFile ("File1", File1)
 
 WGET_OPTIONS = "-d --method=HEAD"
-WGET_URLS = ["File1"]
+WGET_URLS = [["File1"]]
 
-Files = [A_File]
+Files = [[A_File]]
 
 ExpectedReturnCode = 0
 ExpectedDownloadedFiles = []

testenv/Test-O.py

@@ -13,9 +13,9 @@ File1 = "Test Contents."
 A_File = WgetFile ("File1", File1)
 
 WGET_OPTIONS = "-d -O NewFile.txt"
-WGET_URLS = ["File1"]
+WGET_URLS = [["File1"]]
 
-Files = [A_File]
+Files = [[A_File]]
 ExistingFiles = [A_File]
 
 ExpectedReturnCode = 0

testenv/Test-Post.py

@@ -17,9 +17,9 @@ TestMessage"""
 A_File = WgetFile ("File1", File1)
 
 WGET_OPTIONS = "-d --method=post --body-data=TestMessage"
-WGET_URLS = ["File1"]
+WGET_URLS = [["File1"]]
 
-Files = [A_File]
+Files = [[A_File]]
 
 ExpectedReturnCode = 0
 ExpectedDownloadedFiles = [WgetFile ("File1", File1_response)]

testenv/Test-Proto.py

@@ -38,9 +38,9 @@ B_File = WgetFile ("File2", File2, rules=File2_rules)
 C_File = WgetFile ("File3", File3)
 
 WGET_OPTIONS = "-d --content-disposition --user=Sauron --password=TheEye"
-WGET_URLS = ["File1", "File2"]
+WGET_URLS = [["File1", "File2"]]
 
-Files = [A_File, B_File]
+Files = [[A_File, B_File]]
 Existing_Files = [C_File]
 
 ExpectedReturnCode = 0

testenv/Test-auth-basic-fail.py

@@ -20,9 +20,9 @@ File1_rules = {
 A_File = WgetFile ("File1", File1, rules=File1_rules)
 
 WGET_OPTIONS = "-d --user=Sauron --password=Eye"
-WGET_URLS = ["File1"]
+WGET_URLS = [["File1"]]
 
-Files = [A_File]
+Files = [[A_File]]
 
 ExpectedReturnCode = 6
 ExpectedDownloadedFiles = []

testenv/Test-auth-basic.py

@@ -28,9 +28,9 @@ A_File = WgetFile ("File1", File1, rules=File1_rules)
 B_File = WgetFile ("File2", File2, rules=File2_rules)
 
 WGET_OPTIONS = "-d --user=Sauron --password=TheEye"
-WGET_URLS = ["File1", "File2"]
+WGET_URLS = [["File1", "File2"]]
 
-Files = [A_File, B_File]
+Files = [[A_File, B_File]]
 
 ExpectedReturnCode = 0
 ExpectedDownloadedFiles = [A_File, B_File]

testenv/Test-auth-both.py

@@ -46,9 +46,9 @@ B_File = WgetFile ("File2", File2, rules=File2_rules)
 C_File = WgetFile ("File3", File3, rules=File3_rules)
 
 WGET_OPTIONS = "-d --user=Sauron --password=TheEye"
-WGET_URLS = ["File1", "File2", "File3"]
+WGET_URLS = [["File1", "File2", "File3"]]
 
-Files = [A_File, B_File, C_File]
+Files = [[A_File, B_File, C_File]]
 
 ExpectedReturnCode = 0
 ExpectedDownloadedFiles = [A_File, B_File, C_File]

testenv/Test-auth-digest.py

@@ -19,9 +19,9 @@ File1_rules = {
 A_File = WgetFile ("File1", File1, rules=File1_rules)
 
 WGET_OPTIONS = "-d --user=Pacman --password=Omnomnom"
-WGET_URLS = ["File1"]
+WGET_URLS = [["File1"]]
 
-Files = [A_File]
+Files = [[A_File]]
 
 ExpectedReturnCode = 0
 ExpectedDownloadedFiles = [A_File]

testenv/Test-auth-no-challenge-url.py

@@ -23,9 +23,9 @@ File1_rules = {
 A_File = WgetFile ("File1", File1, rules=File1_rules)
 
 WGET_OPTIONS = "-d --auth-no-challenge http://Pacman:Omnomnom@localhost:{{port}}/File1"
-WGET_URLS = []
+WGET_URLS = [[]]
 
-Files = [A_File]
+Files = [[A_File]]
 
 ExpectedReturnCode = 0
 ExpectedDownloadedFiles = [A_File]

testenv/Test-auth-no-challenge.py

@@ -23,9 +23,9 @@ File1_rules = {
 A_File = WgetFile ("File1", File1, rules=File1_rules)
 
 WGET_OPTIONS = "-d --auth-no-challenge --user=Pacman --password=Omnomnom"
-WGET_URLS = ["File1"]
+WGET_URLS = [["File1"]]
 
-Files = [A_File]
+Files = [[A_File]]
 
 ExpectedReturnCode = 0
 ExpectedDownloadedFiles = [A_File]

testenv/Test-auth-retcode.py

@@ -19,9 +19,9 @@ File1_rules = {
 A_File = WgetFile ("File1", File1, rules=File1_rules)
 
 WGET_OPTIONS = "-d"
-WGET_URLS = ["File1"]
+WGET_URLS = [["File1"]]
 
-Files = [A_File]
+Files = [[A_File]]
 
 ExpectedReturnCode = 8
 ExpectedDownloadedFiles = []

testenv/Test-auth-with-content-disposition.py

@@ -23,9 +23,9 @@ File1_rules = {
 A_File = WgetFile ("File1", File1, rules=File1_rules)
 
 WGET_OPTIONS = "-d --user=Pacman --password=Omnomnom --content-disposition"
-WGET_URLS = ["File1"]
+WGET_URLS = [["File1"]]
 
-Files = [A_File]
+Files = [[A_File]]
 
 ExpectedReturnCode = 0
 ExpectedDownloadedFiles = [WgetFile ("Arch", File1)]

testenv/Test-c-full.py

@@ -20,9 +20,9 @@ D_File = WgetFile ("File2", File2)
 E_File = WgetFile ("File3", File1)
 
 WGET_OPTIONS = "-d -c"
-WGET_URLS = ["File1", "File2", "File3"]
+WGET_URLS = [["File1", "File2", "File3"]]
 
-Files = [A_File, C_File, E_File]
+Files = [[A_File, C_File, E_File]]
 Existing_Files = [B_File, D_File]
 
 ExpectedReturnCode = 0

testenv/Test-cookie-401.py

@@ -28,9 +28,9 @@ A_File = WgetFile ("File1", File1, rules=File1_rules)
 B_File = WgetFile ("File2", File2, rules=File2_rules)
 
 WGET_OPTIONS = "-d"
-WGET_URLS = ["File1", "File2"]
+WGET_URLS = [["File1", "File2"]]
 
-Files = [A_File, B_File]
+Files = [[A_File, B_File]]
 
 ExpectedReturnCode = 6
 ExpectedDownloadedFiles = [B_File]

testenv/Test-cookie-domain-mismatch.py

@@ -26,9 +26,9 @@ A_File = WgetFile ("File1", File1, rules=File1_rules)
 B_File = WgetFile ("File2", File2, rules=File2_rules)
 
 WGET_OPTIONS = "-d"
-WGET_URLS = ["File1", "File2"]
+WGET_URLS = [["File1", "File2"]]
 
-Files = [A_File, B_File]
+Files = [[A_File, B_File]]
 
 ExpectedReturnCode = 0
 ExpectedDownloadedFiles = [A_File, B_File]

testenv/Test-cookie-expires.py

@@ -49,9 +49,9 @@ C_File = WgetFile ("File3", File3, rules=File3_rules)
 D_File = WgetFile ("File4", File4, rules=File4_rules)
 
 WGET_OPTIONS = "-d"
-WGET_URLS = ["File1", "File2", "File3", "File4"]
+WGET_URLS = [["File1", "File2", "File3", "File4"]]
 
-Files = [A_File, B_File, C_File, D_File]
+Files = [[A_File, B_File, C_File, D_File]]
 
 ExpectedReturnCode = 0
 ExpectedDownloadedFiles = [A_File, B_File, C_File, D_File]

testenv/Test-cookie.py

@@ -26,9 +26,9 @@ A_File = WgetFile ("File1", File1, rules=File1_rules)
 B_File = WgetFile ("File2", File2, rules=File2_rules)
 
 WGET_OPTIONS = "-d"
-WGET_URLS = ["File1", "File2"]
+WGET_URLS = [["File1", "File2"]]
 
-Files = [A_File, B_File]
+Files = [[A_File, B_File]]
 
 ExpectedReturnCode = 0
 ExpectedDownloadedFiles = [A_File, B_File]