diff options
| author | Darshit Shah <darnir@gmail.com> | 2014-09-14 16:57:15 +0530 |
|---|---|---|
| committer | Darshit Shah <darnir@gmail.com> | 2014-09-14 16:57:15 +0530 |
| commit | af702340a1f3b462d0224968602c2b2974f218d6 (patch) | |
| tree | a1d352f6d30505ecc856d5b7561d4dc001b3a891 /testenv/test/base_test.py | |
| parent | 6140b1b6e3831a35fd2cf4536fda741a4dcc9019 (diff) | |
| parent | f8e9a64ec7445d22f67f1817043d5807c4766556 (diff) | |
| download | wget-parallel-wget.tar.gz | |
Merge remote-tracking branch 'origin/master' into parallel-wgetparallel-wget
Conflicts:
src/http.c
testenv/Makefile.am
testenv/Test--https.py
testenv/Test--spider-r.py
testenv/Test-Content-disposition-2.py
testenv/Test-Content-disposition.py
testenv/Test-Head.py
testenv/Test-O.py
testenv/Test-Parallel-Proto.py
testenv/Test-Post.py
testenv/Test-Proto.py
testenv/Test-auth-basic-fail.py
testenv/Test-auth-basic.py
testenv/Test-auth-both.py
testenv/Test-auth-digest.py
testenv/Test-auth-no-challenge-url.py
testenv/Test-auth-no-challenge.py
testenv/Test-auth-retcode.py
testenv/Test-auth-with-content-disposition.py
testenv/Test-c-full.py
testenv/Test-cookie-401.py
testenv/Test-cookie-domain-mismatch.py
testenv/Test-cookie-expires.py
testenv/Test-cookie.py
testenv/conf/__init__.py
testenv/conf/authentication.py
testenv/conf/expect_header.py
testenv/conf/expected_files.py
testenv/conf/expected_ret_code.py
testenv/conf/files_crawled.py
testenv/conf/hook_sample.py
testenv/conf/local_files.py
testenv/conf/reject_header.py
testenv/conf/response.py
testenv/conf/send_header.py
testenv/conf/server_files.py
testenv/conf/urls.py
testenv/conf/wget_commands.py
testenv/misc/colour_terminal.py
testenv/server/http/http_server.py
testenv/test/base_test.py
testenv/test/http_test.py
Diffstat (limited to 'testenv/test/base_test.py')
| -rw-r--r-- | testenv/test/base_test.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/testenv/test/base_test.py b/testenv/test/base_test.py index 369370a3..8bf8ea5f 100644 --- a/testenv/test/base_test.py +++ b/testenv/test/base_test.py @@ -28,9 +28,9 @@ class BaseTest: Attributes should not be defined outside __init__. """ self.name = name - self.pre_configs = pre_hook or {} # if pre_hook == None, then - # {} (an empty dict object) is - # passed to self.pre_configs + self.pre_configs = pre_hook or {} # if pre_hook == None, then + # {} (an empty dict object) is + # passed to self.pre_configs self.test_params = test_params or {} self.post_configs = post_hook or {} self.protocols = protocols @@ -98,12 +98,13 @@ class BaseTest: test_path = os.path.abspath(".") wget_path = os.path.abspath(os.path.join(test_path, "..", '..', 'src', "wget")) + wget_options = '--debug --no-config %s' % self.wget_options if os.getenv("VALGRIND_TESTS"): valgrind_test = "valgrind --error-exitcode=301 --leak-check=full" else: valgrind_test = "" - cmd_line = '%s %s %s ' % (valgrind_test, wget_path, self.wget_options) + cmd_line = '%s %s %s ' % (valgrind_test, wget_path, wget_options) for protocol, urls, domain in zip(self.protocols, self.urls, self.domains): |