Re: [Bug-wget] Compilation Error when without-ssl is selected

[Ygal Blum]

Hi Tim,

Sorry for seeing this only now, but I've noticed that the patch file I've
sent included my work e-mail and not my private. Can you please change it
to address@hidden Though it is a minor fix, it should come from my
personal e-mail.

Thanks,
Ygal

On Fri, Dec 4, 2015 at 4:54 PM Tim Ruehsen <address@hidden> wrote:

> Pushed (slightly amended).
>
> Tim
>
> On Friday 04 December 2015 13:09:50 Darshit Shah wrote:
> > On 12/04, Tim Rühsen wrote:
> > >Hi Darshit,
> > >
> > >regarding the SKIP, a little patch proposal based on your commits.
> > >
> > >Feel free to merge it with your changes (if you agree on using SKIP).
> >
> > Looks good. Feel free to push it instead of mine.
> >
> > Also, the https test passes due to the same bug as earlier. I'll try and
> > work it out in the next week. Shouldn't take too much time.
> >
> > >Tim
> > >
> > >On Thursday 03 December 2015 17:21:52 Darshit Shah wrote:
> > >> On 11/24, Tim Rühsen wrote:
> > >> >Hi Ygal,
> > >> >
> > >> >many thanks for the patch.
> > >> >
> > >> >An interesting side effect of testing './configure --without-ssl' is
> > >> >that
> > >> >there are at least three issues with the python test suite.
> > >> >
> > >> >I made up patches for two of them (attached).
> > >> >
> > >> >@Darshit Could you review
> 0001-Fix-python-test-suite-return-value.patch
> > >> >? -
> > >> >You are most familiar with the python test suite.
> > >> >
> > >> >The third is that Test--rejected-log.py now reports error, but that
> > >> >seems
> > >> >to be just coming out as a consequence of my test suite fix.
> > >> >
> > >> >Tim
> > >>
> > >> Hi Tim,
> > >>
> > >> I took a look at the patches. There is a subtle bug somewhere in the
> Test
> > >> Suite, but now I know how to reproduce it. I'll spend some time over
> next
> > >> week to fix it.
> > >>
> > >> However, I've attached another patch that can work well. We should not
> > >> execute the tests if we know they will fail. I'm also going to look
> into
> > >> SKIPping tests using this framework.
> > >>
> > >> Getting back to topic, I'm pushing the HTTPS fix to Git right now. If
> > >> there
> > >> are no complains about the attached patch here, we can push it to Git
> > >> later
> > >> today / tomorrow.
> > >>
> > >> >On Tuesday 24 November 2015 11:26:43 Ygal Blum wrote:
> > >> >> Hi,
> > >> >>
> > >> >> When selecting without-ssl during configuration the compilation
> > >> >> breaks.
> > >> >> Please find attached the patch with the fix.
> > >> >>
> > >> >> Best Regards,
> > >> >> Ygal Blum
> > >> >
> > >> >From b273c8aa85fdcd68c92b0908545769cac624218a Mon Sep 17 00:00:00
> 2001
> > >> >From: =?UTF-8?q?Tim=20R=C3=BChsen?= <address@hidden>
> > >> >Date: Tue, 24 Nov 2015 16:30:04 +0100
> > >> >Subject: [PATCH 1/2] Fix python test suite return value
> > >> >
> > >> >* testenv/test/base_test.py: Return False on TestFailed exception
> > >> >---
> > >> >
> > >> > testenv/test/base_test.py | 2 ++
> > >> > 1 file changed, 2 insertions(+)
> > >> >
> > >> >diff --git a/testenv/test/base_test.py b/testenv/test/base_test.py
> > >> >index c5b82be..df4bec3 100644
> > >> >--- a/testenv/test/base_test.py
> > >> >+++ b/testenv/test/base_test.py
> > >> >
> > >> >@@ -257,6 +257,8 @@ class BaseTest:
> > >> >             self.tests_passed = False
> > >> >
> > >> >             if exc_type is TestFailed:
> > >> >                 print_red('Error: %s.' % exc_val.error)
> > >> >
> > >> >+                self.__test_cleanup()
> > >> >+                return False
> > >> >
> > >> >             else:
> > >> >                 print_red('Unhandled exception caught.')
> > >> >                 print(exc_val)
> > >> >
> > >> >From d23d9dcb7c28eea884b839e473250a2f7efff7e5 Mon Sep 17 00:00:00
> 2001
> > >> >From: =?UTF-8?q?Tim=20R=C3=BChsen?= <address@hidden>
> > >> >Date: Tue, 24 Nov 2015 16:32:11 +0100
> > >> >Subject: [PATCH 2/2] Add Test-hsts.py to SSL_TESTS
> > >> >
> > >> >* testenv/Makefile.am: Add Test-hsts.py to SSL_TESTS
> > >> >---
> > >> >
> > >> > testenv/Makefile.am | 3 +--
> > >> > 1 file changed, 1 insertion(+), 2 deletions(-)
> > >> >
> > >> >diff --git a/testenv/Makefile.am b/testenv/Makefile.am
> > >> >index c16a6c6..7fe24bd 100644
> > >> >--- a/testenv/Makefile.am
> > >> >+++ b/testenv/Makefile.am
> > >> >@@ -37,7 +37,7 @@ AUTOMAKE_OPTIONS = parallel-tests
> > >> >
> > >> > AM_TESTS_ENVIRONMENT = export WGETRC=/dev/null; MAKE_CHECK=True;
> export
> > >> > MAKE_CHECK;\>
> > >> >
> > >> >  export PYTHONPATH=$$PYTHONPATH:$(srcdir); export
> > >> >  VALGRIND_TESTS="@VALGRIND_TESTS@";>
> > >> >
> > >> >-SSL_TESTS = Test--https.py Test--https-crl.py
> > >> >+SSL_TESTS = Test--https.py Test--https-crl.py Test-hsts.py
> > >> >
> > >> > if HAVE_PYTHON3
> > >> >
> > >> >   TESTS = Test-auth-basic-fail.py                   \
> > >> >
> > >> >     Test-auth-basic.py                              \
> > >> >
> > >> >@@ -58,7 +58,6 @@ if HAVE_PYTHON3
> > >> >
> > >> >     Test-Head.py                                    \
> > >> >     Test--https.py                                  \
> > >> >     Test--https-crl.py                              \
> > >> >
> > >> >-    Test-hsts.py                                    \
> > >> >
> > >> >     Test-O.py                                       \
> > >> >     Test-Post.py                                    \
> > >> >     Test-504.py                                     \
> > >
> > >diff --git a/testenv/Makefile.am b/testenv/Makefile.am
> > >index 9fa73d3..82b66a4 100644
> > >--- a/testenv/Makefile.am
> > >+++ b/testenv/Makefile.am
> > >@@ -38,9 +38,7 @@ AM_TESTS_ENVIRONMENT = export WGETRC=/dev/null;
> > >MAKE_CHECK=True; export MAKE_CHE>
> > >  export PYTHONPATH=$$PYTHONPATH:$(srcdir); export
> > >  VALGRIND_TESTS="@VALGRIND_TESTS@";>
> > > if WITH_SSL
> > >
> > >-  SSL_TESTS = Test--https.py Test--https-crl.py Test-hsts.py
> > >-else
> > >-  SSL_TESTS =
> > >+  AM_TESTS_ENVIRONMENT += SSL_TESTS=1;
> > >
> > > endif
> > >
> > > if HAVE_PYTHON3
> > >
> > >@@ -63,6 +61,7 @@ if HAVE_PYTHON3
> > >
> > >     Test-Head.py                                    \
> > >     Test--https.py                                  \
> > >     Test--https-crl.py                              \
> > >
> > >+    Test-hsts.py                                    \
> > >
> > >     Test-O.py                                       \
> > >     Test-Post.py                                    \
> > >     Test-504.py                                     \
> > >
> > >@@ -71,7 +70,6 @@ if HAVE_PYTHON3
> > >
> > >     Test-redirect-crash.py                          \
> > >     Test-reserved-chars.py                          \
> > >     Test-condget.py                                 \
> > >
> > >-    $(SSL_TESTS)                                    \
> > >
> > >     $(METALINK_TESTS)
> > >
> > > endif
> > >
> > >diff --git a/testenv/Test--https-crl.py b/testenv/Test--https-crl.py
> > >index 9330a1e..e3724cd 100755
> > >--- a/testenv/Test--https-crl.py
> > >+++ b/testenv/Test--https-crl.py
> > >@@ -9,6 +9,9 @@ import os
> > >
> > >     This test ensures that Wget can download files from HTTPS Servers
> > >
> > > """
> > > TEST_NAME = "HTTPS CRL"
> > >
> > >+if os.getenv('SSL_TESTS') != '1':
> > >+    exit (77)
> > >+
> > >
> > > ############# File Definitions
> > > ############################################### File1 = "Would you like
> > > some Tea?"
> > > File2 = "With lemon or cream?"
> > >
> > >diff --git a/testenv/Test--https.py b/testenv/Test--https.py
> > >index b8d4faf..5e29e4f 100755
> > >--- a/testenv/Test--https.py
> > >+++ b/testenv/Test--https.py
> > >@@ -9,6 +9,9 @@ import os
> > >
> > >     This test ensures that Wget can download files from HTTPS Servers
> > >
> > > """
> > > TEST_NAME = "HTTPS Downloads"
> > >
> > >+if os.getenv('SSL_TESTS') != '1':
> > >+    exit (77)
> > >+
> > >
> > > ############# File Definitions
> > > ############################################### File1 = "Would you like
> > > some Tea?"
> > > File2 = "With lemon or cream?"
> > >
> > >diff --git a/testenv/Test-hsts.py b/testenv/Test-hsts.py
> > >index 4290929..0559754 100755
> > >--- a/testenv/Test-hsts.py
> > >+++ b/testenv/Test-hsts.py
> > >
> > >@@ -26,6 +26,8 @@ def create_hsts_database(path, host, port):
> > >     f.close()
> > >
> > > TEST_NAME = "HSTS basic test"
> > >
> > >+if os.getenv('SSL_TESTS') != '1':
> > >+    exit (77)
> > >
> > > File_Name = "hw"
> > > File_Content = "Hello, world!"
>