diff --git a/testenv/ChangeLog b/testenv/ChangeLog index 68894458..e28e0582 100644 --- a/testenv/ChangeLog +++ b/testenv/ChangeLog @@ -1,3 +1,9 @@ +2014-03-13 Zihang Chen + + * WgetTest.py: Move WgetFile to package misc. + * README: Modify documentation respect to WgetFile. + * Test-*.py: Optimize imports about WgetFile. + 2014-03-13 Zihang Chen * misc: (new package) package for miscellaneous modules diff --git a/testenv/README b/testenv/README index 487541db..5ae437b9 100644 --- a/testenv/README +++ b/testenv/README @@ -31,6 +31,8 @@ Structure: - colour_terminal.py: A custom module for printing coloured output to the terminal. Currently it only supports 4 colours in a *nix environment. + - wget_file.py: Module which contains WgetFile, which is a file data + container object. Working: ================================================================================ @@ -96,7 +98,8 @@ effort to get accustomed to. All Test Files MUST begin with the following Three Lines: #!/usr/bin/python3 from sys import exit -from WgetTest import {HTTPTest|FTPTest}, WgetFile +from WgetTest import {HTTPTest|FTPTest} +from misc.wget_file import WgetFile It is recommended that a small description of the Test Case is provided next. This would be very helpful to future contributors. @@ -104,7 +107,7 @@ Next, is the const variable, TEST_NAME that defines the name of the Test. Each File in the Test must be represented as a WgetFile object. The WgetFile Class has the following prototype: -WgetFile (String name, String contents, String timestamp, dict rules) +WgetFile (str name, str contents, str timestamp, dict rules) None except name is a mandatory paramter, one may pass only those parameters that are required by the File object. diff --git a/testenv/Test--https.py b/testenv/Test--https.py index 17252b6b..066f2d91 100755 --- a/testenv/Test--https.py +++ b/testenv/Test--https.py @@ -1,6 +1,7 @@ #!/usr/bin/env python3 from sys import exit -from WgetTest import HTTPTest, WgetFile, HTTPS, HTTP +from WgetTest import HTTPTest, HTTPS, HTTP +from misc.wget_file import WgetFile """ This test ensures that Wget can download files from HTTPS Servers diff --git a/testenv/Test--spider-r.py b/testenv/Test--spider-r.py index b770a9f2..c099f5a1 100755 --- a/testenv/Test--spider-r.py +++ b/testenv/Test--spider-r.py @@ -1,6 +1,7 @@ #!/usr/bin/env python3 from sys import exit -from WgetTest import HTTPTest, WgetFile +from WgetTest import HTTPTest +from misc.wget_file import WgetFile """ This test executed Wget in Spider mode with recursive retrieval. diff --git a/testenv/Test-Content-disposition-2.py b/testenv/Test-Content-disposition-2.py index c2512e16..423ea270 100755 --- a/testenv/Test-Content-disposition-2.py +++ b/testenv/Test-Content-disposition-2.py @@ -1,6 +1,7 @@ #!/usr/bin/env python3 from sys import exit -from WgetTest import HTTPTest, WgetFile +from WgetTest import HTTPTest +from misc.wget_file import WgetFile """ This test ensures that Wget parses the Content-Disposition header diff --git a/testenv/Test-Content-disposition.py b/testenv/Test-Content-disposition.py index 0a81dea2..45914b21 100755 --- a/testenv/Test-Content-disposition.py +++ b/testenv/Test-Content-disposition.py @@ -1,6 +1,7 @@ #!/usr/bin/env python3 from sys import exit -from WgetTest import HTTPTest, WgetFile +from WgetTest import HTTPTest +from misc.wget_file import WgetFile """ This test ensures that Wget parses the Content-Disposition header diff --git a/testenv/Test-Head.py b/testenv/Test-Head.py index 49aaa411..d0fad755 100755 --- a/testenv/Test-Head.py +++ b/testenv/Test-Head.py @@ -1,6 +1,7 @@ #!/usr/bin/env python3 from sys import exit -from WgetTest import HTTPTest, WgetFile +from WgetTest import HTTPTest +from misc.wget_file import WgetFile """ This test ensures that Wget correctly handles responses to HEAD requests diff --git a/testenv/Test-O.py b/testenv/Test-O.py index 613fbcdb..4b3c26af 100755 --- a/testenv/Test-O.py +++ b/testenv/Test-O.py @@ -1,6 +1,7 @@ #!/usr/bin/env python3 from sys import exit -from WgetTest import HTTPTest, WgetFile +from WgetTest import HTTPTest +from misc.wget_file import WgetFile """ This test ensures that Wget correctly handles the -O command for output diff --git a/testenv/Test-Parallel-Proto.py b/testenv/Test-Parallel-Proto.py index e7aae2ef..6e09bfb5 100755 --- a/testenv/Test-Parallel-Proto.py +++ b/testenv/Test-Parallel-Proto.py @@ -1,6 +1,7 @@ #!/usr/bin/env python3 from sys import exit -from WgetTest import HTTPTest, WgetFile, HTTP, HTTPS +from WgetTest import HTTPTest, HTTP, HTTPS +from misc.wget_file import WgetFile """ This is a Prototype Test File for multiple servers. diff --git a/testenv/Test-Post.py b/testenv/Test-Post.py index 632326fd..d7ad616e 100755 --- a/testenv/Test-Post.py +++ b/testenv/Test-Post.py @@ -1,6 +1,7 @@ #!/usr/bin/env python3 from sys import exit -from WgetTest import HTTPTest, WgetFile +from WgetTest import HTTPTest +from misc.wget_file import WgetFile """ Simple test for HTTP POST Requests usiong the --method command diff --git a/testenv/Test-Proto.py b/testenv/Test-Proto.py index eaafdc13..e6d1aad6 100755 --- a/testenv/Test-Proto.py +++ b/testenv/Test-Proto.py @@ -1,6 +1,7 @@ #!/usr/bin/env python3 from sys import exit -from WgetTest import HTTPTest, WgetFile, HTTP, HTTPS +from WgetTest import HTTPTest, HTTP, HTTPS +from misc.wget_file import WgetFile """ This is a Prototype Test File. diff --git a/testenv/Test-auth-basic-fail.py b/testenv/Test-auth-basic-fail.py index 894e96dd..e2890d58 100755 --- a/testenv/Test-auth-basic-fail.py +++ b/testenv/Test-auth-basic-fail.py @@ -1,6 +1,7 @@ #!/usr/bin/env python3 from sys import exit -from WgetTest import HTTPTest, WgetFile +from WgetTest import HTTPTest +from misc.wget_file import WgetFile """ This test ensures that Wget returns the correct exit code when Basic diff --git a/testenv/Test-auth-basic.py b/testenv/Test-auth-basic.py index 96141e08..2cafa40e 100755 --- a/testenv/Test-auth-basic.py +++ b/testenv/Test-auth-basic.py @@ -1,6 +1,7 @@ #!/usr/bin/env python3 from sys import exit -from WgetTest import HTTPTest, WgetFile +from WgetTest import HTTPTest +from misc.wget_file import WgetFile """ This test ensures Wget's Basic Authorization Negotiation. diff --git a/testenv/Test-auth-both.py b/testenv/Test-auth-both.py index 98371348..214ef0eb 100755 --- a/testenv/Test-auth-both.py +++ b/testenv/Test-auth-both.py @@ -1,6 +1,7 @@ #!/usr/bin/env python3 from sys import exit -from WgetTest import HTTPTest, WgetFile +from WgetTest import HTTPTest +from misc.wget_file import WgetFile """ This test ensures Wget's Basic Authorization Negotiation. diff --git a/testenv/Test-auth-digest.py b/testenv/Test-auth-digest.py index a66b2c97..44e261f8 100755 --- a/testenv/Test-auth-digest.py +++ b/testenv/Test-auth-digest.py @@ -1,6 +1,7 @@ #!/usr/bin/env python3 from sys import exit -from WgetTest import HTTPTest, WgetFile +from WgetTest import HTTPTest +from misc.wget_file import WgetFile """ This test ensures Wget's Digest Authorization Negotiation. diff --git a/testenv/Test-auth-no-challenge-url.py b/testenv/Test-auth-no-challenge-url.py index eb88ac5f..e0f851f9 100755 --- a/testenv/Test-auth-no-challenge-url.py +++ b/testenv/Test-auth-no-challenge-url.py @@ -1,6 +1,7 @@ #!/usr/bin/env python3 from sys import exit -from WgetTest import HTTPTest, WgetFile +from WgetTest import HTTPTest +from misc.wget_file import WgetFile """ This test ensures Wget's Basic Authorization Negotiation, when credentials diff --git a/testenv/Test-auth-no-challenge.py b/testenv/Test-auth-no-challenge.py index 774bd59a..1d0e355e 100755 --- a/testenv/Test-auth-no-challenge.py +++ b/testenv/Test-auth-no-challenge.py @@ -1,6 +1,7 @@ #!/usr/bin/env python3 from sys import exit -from WgetTest import HTTPTest, WgetFile +from WgetTest import HTTPTest +from misc.wget_file import WgetFile """ This test ensures Wget's Basic Authorization Negotiation, when the diff --git a/testenv/Test-auth-retcode.py b/testenv/Test-auth-retcode.py index adbcbb05..5619f9f5 100755 --- a/testenv/Test-auth-retcode.py +++ b/testenv/Test-auth-retcode.py @@ -1,6 +1,7 @@ #!/usr/bin/env python3 from sys import exit -from WgetTest import HTTPTest, WgetFile +from WgetTest import HTTPTest +from misc.wget_file import WgetFile """ This test ensures that Wget returns the correct return code when sent diff --git a/testenv/Test-auth-with-content-disposition.py b/testenv/Test-auth-with-content-disposition.py index 50e08ba2..a28b088f 100755 --- a/testenv/Test-auth-with-content-disposition.py +++ b/testenv/Test-auth-with-content-disposition.py @@ -1,6 +1,7 @@ #!/usr/bin/env python3 from sys import exit -from WgetTest import HTTPTest, WgetFile +from WgetTest import HTTPTest +from misc.wget_file import WgetFile """ This test ensures that Wget handles Content-Disposition correctly when diff --git a/testenv/Test-c-full.py b/testenv/Test-c-full.py index 87ffc529..5b035fdd 100755 --- a/testenv/Test-c-full.py +++ b/testenv/Test-c-full.py @@ -1,6 +1,7 @@ #!/usr/bin/env python3 from sys import exit -from WgetTest import HTTPTest, WgetFile +from WgetTest import HTTPTest +from misc.wget_file import WgetFile """ Test Wget's response when the file requested already exists on disk with diff --git a/testenv/Test-cookie-401.py b/testenv/Test-cookie-401.py index 9ca96415..3161d1d7 100755 --- a/testenv/Test-cookie-401.py +++ b/testenv/Test-cookie-401.py @@ -1,6 +1,7 @@ #!/usr/bin/env python3 from sys import exit -from WgetTest import HTTPTest, WgetFile +from WgetTest import HTTPTest +from misc.wget_file import WgetFile """ This test ensures that Wget stores the cookie even in the event of a diff --git a/testenv/Test-cookie-domain-mismatch.py b/testenv/Test-cookie-domain-mismatch.py index ae108d99..e6bf7bb9 100755 --- a/testenv/Test-cookie-domain-mismatch.py +++ b/testenv/Test-cookie-domain-mismatch.py @@ -1,6 +1,7 @@ #!/usr/bin/env python3 from sys import exit -from WgetTest import HTTPTest, WgetFile +from WgetTest import HTTPTest +from misc.wget_file import WgetFile """ This test ensures that Wget identifies bad servers trying to set cookies diff --git a/testenv/Test-cookie-expires.py b/testenv/Test-cookie-expires.py index 2ae3bf90..78bc8b9b 100755 --- a/testenv/Test-cookie-expires.py +++ b/testenv/Test-cookie-expires.py @@ -1,6 +1,7 @@ #!/usr/bin/env python3 from sys import exit -from WgetTest import HTTPTest, WgetFile +from WgetTest import HTTPTest +from misc.wget_file import WgetFile """ This test ensures that Wget handles Cookie expiry dates correctly. diff --git a/testenv/Test-cookie.py b/testenv/Test-cookie.py index 7f5b0932..df62d143 100755 --- a/testenv/Test-cookie.py +++ b/testenv/Test-cookie.py @@ -1,6 +1,7 @@ #!/usr/bin/env python3 from sys import exit -from WgetTest import HTTPTest, WgetFile +from WgetTest import HTTPTest +from misc.wget_file import WgetFile """ This test ensures that Wget's cookie jar support works correctly. diff --git a/testenv/WgetTest.py b/testenv/WgetTest.py index c0961e11..a73e8d9f 100644 --- a/testenv/WgetTest.py +++ b/testenv/WgetTest.py @@ -318,20 +318,5 @@ class HTTPTest (CommonMethods): self.Request_remaining.append (server_req) server.server_inst.shutdown () -""" WgetFile is a File Data Container object """ - -class WgetFile: - - def __init__ ( - self, - name, - content="Test Contents", - timestamp=None, - rules=dict() - ): - self.name = name - self.content = content - self.timestamp = timestamp - self.rules = rules # vim: set ts=4 sts=4 sw=4 tw=80 et : diff --git a/testenv/misc/wget_file.py b/testenv/misc/wget_file.py new file mode 100644 index 00000000..027dcedf --- /dev/null +++ b/testenv/misc/wget_file.py @@ -0,0 +1,16 @@ + +class WgetFile: + + """ WgetFile is a File Data Container object """ + + def __init__ ( + self, + name, + content="Test Contents", + timestamp=None, + rules=None + ): + self.name = name + self.content = content + self.timestamp = timestamp + self.rules = rules or {}