From daa693a9a4a37c20c2e325408a898ed3505f06fb Mon Sep 17 00:00:00 2001 From: Lukas Holecek <hluk@email.cz> Date: Thu, 18 Jun 2020 12:48:57 +0200 Subject: [PATCH] Tests: Test fetching https with networkGet() Signed-off-by: Lukas Holecek <hluk@email.cz> --- src/tests/tests.cpp | 7 +++++++ src/tests/tests.h | 2 ++ utils/appveyor/after_build.bat | 7 +++++++ 3 files changed, 16 insertions(+) diff --git a/src/tests/tests.cpp b/src/tests/tests.cpp index 07f2421a7..ded7342c7 100644 --- a/src/tests/tests.cpp +++ b/src/tests/tests.cpp @@ -3637,6 +3637,13 @@ void Tests::changeAlwaysOnTop() WAIT_ON_OUTPUT("focused", "false\n"); } +void Tests::networkGet() +{ + SKIP_ON_ENV("COPYQ_TESTS_NO_NETWORK"); + + RUN("r = networkGet('https://example.com'); r.data; r.status", "200\n"); +} + int Tests::run( const QStringList &arguments, QByteArray *stdoutData, QByteArray *stderrData, const QByteArray &in, const QStringList &environment) diff --git a/src/tests/tests.h b/src/tests/tests.h index e9da4c845..7649234ea 100644 --- a/src/tests/tests.h +++ b/src/tests/tests.h @@ -274,6 +274,8 @@ private slots: void changeAlwaysOnTop(); + void networkGet(); + private: void clearServerErrors(); int run(const QStringList &arguments, QByteArray *stdoutData = nullptr, diff --git a/utils/appveyor/after_build.bat b/utils/appveyor/after_build.bat index afb66b12f..efc1a7097 100644 --- a/utils/appveyor/after_build.bat +++ b/utils/appveyor/after_build.bat @@ -40,6 +40,13 @@ xcopy /F "%OPENSSL_PATH%\%LIBSSL%" "%Destination%" || goto :error choco install -y InnoSetup || goto :error "C:\ProgramData\chocolatey\bin\ISCC.exe" "/O%APPVEYOR_BUILD_FOLDER%" "/DAppVersion=%AppVersion%" "/DRoot=%Destination%" "/DSource=%Source%" "%Source%\Shared\copyq.iss" || goto :error +REM Note: Following removes system-installed dlls to verify required libs are included. +del C:\Windows\System32\libcrypto-* || goto :error +del C:\Windows\System32\libssl-* || goto :error +del C:\Windows\SysWOW64\libcrypto-* || goto :error +del C:\Windows\SysWOW64\libssl-* || goto :error +set PATH=%Destination% + set QT_FORCE_STDERR_LOGGING=1 set COPYQ_TESTS_RERUN_FAILED=1 "%Executable%" --help || goto :error -- GitLab