Skip to content

Remove explicit redis-server checks #3891

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
uglide merged 2 commits into from
Aug 25, 2017
Merged

Remove explicit redis-server checks #3891

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d3ba6fa
Remove explicit redis-server checks
uglide Aug 25, 2017
60cba8a
Update appveyor.yml
uglide Aug 25, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 3rdparty/qredisclient
Open in desktop
Submodule qredisclient updated 5 files
+4 −5 .travis.yml
+22 −21 3rdparty/3rdparty.pri
+6 −3 appveyor.yml
+1 −1 src/configure.bat
+12 −26 src/qredisclient/connection.cpp
11 changes: 6 additions & 5 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@ version: 0.9.0.{build}
clone_depth: 5
install:
- git submodule update --init --recursive
- set QTDIR=C:\Qt\5.8\msvc2015
- set QTDIR=C:\Qt\5.9\msvc2015
- set PATH=%QTDIR%\bin;%PATH%
- call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat"
- nuget install -Version 1.6.0.2 -OutputDirectory ./3rdparty/qredisclient/3rdparty/windows rmt_libssh2
- nuget install -Version 1.2.8.6 -OutputDirectory ./3rdparty/qredisclient/3rdparty/windows rmt_zlib
- nuget install -Version 1.8.0 -OutputDirectory ./3rdparty/qredisclient/3rdparty/windows rmt_libssh2
- qmake -v

build_script:
Expand All @@ -23,8 +22,10 @@ build_script:
- cd %SRCDIR%
- copy /y .\bin\windows\release\rdm.exe .\build\windows\installer\resources\rdm.exe
- copy /y .\bin\windows\release\rdm.pdb .\build\windows\installer\resources\rdm.pdb
- copy /y .\3rdparty\qredisclient\3rdparty\windows\rmt_openssl.1.0.2.5\build\native\bin\v140\Win32\Release\dynamic\libeay32.dll .\build\windows\installer\resources\libeay32.dll
- copy /y .\3rdparty\qredisclient\3rdparty\windows\rmt_openssl.1.0.2.5\build\native\bin\v140\Win32\Release\dynamic\ssleay32.dll .\build\windows\installer\resources\ssleay32.dll
- copy /y .\3rdparty\qredisclient\3rdparty\windows\rmt_openssl.1.1.0.3\build\native\bin\v140\Win32\Release\dynamic\libcrypto-1_1.dll .\build\windows\installer\resources\libcrypto-1_1.dll
- copy /y .\3rdparty\qredisclient\3rdparty\windows\rmt_openssl.1.1.0.3\build\native\bin\v140\Win32\Release\dynamic\libssl-1_1.dll .\build\windows\installer\resources\libssl-1_1.dll
- copy /y .\3rdparty\qredisclient\3rdparty\windows\rmt_openssl.1.1.0.3\build\native\bin\v140\Win32\Release\dynamic\capi.dll .\build\windows\installer\resources\capi.dll
- copy /y .\3rdparty\qredisclient\3rdparty\windows\rmt_openssl.1.1.0.3\build\native\bin\v140\Win32\Release\dynamic\padlock.dll .\build\windows\installer\resources\padlock.dll
- cd build/windows/installer/resources/
- windeployqt --no-translations --compiler-runtime --angle --release --force --qmldir %SRCDIR%/src/qml rdm.exe
- cd %SRCDIR%
Expand Down
6 changes: 1 addition & 5 deletions src/app/models/treeoperations.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,7 @@ void TreeOperations::getDatabases(std::function<void (RedisClient::DatabaseList)
if (!connected) {
throw ConnectionsTree::Operations::Exception(
QObject::tr("Cannot connect to server '%1'. Check log for details.").arg(m_connection->getConfig().name()));
}

if (m_connection->getServerVersion() < 2.8)
throw ConnectionsTree::Operations::Exception(QObject::tr("RedisDesktopManager >= 0.9.0 doesn't support old versions of "
"redis-server (< 2.8). Please use RedisDesktopManager 0.8.8 or upgrade your redis-server."));
}

RedisClient::DatabaseList availableDatabeses = m_connection->getKeyspaceInfo();

Expand Down
21 changes: 0 additions & 21 deletions tests/unit_tests/testcases/app/test_treeoperations.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,26 +55,6 @@ void TestTreeOperations::testGetDatabases()
QCOMPARE(result.size(), 1003);
}

void TestTreeOperations::testGetDatabasesOnOldRedis()
{
//given
ConnectionsManager manager{QString()};
auto connection = getFakeConnection(QList<QVariant>(), QStringList(), 2.6);
bool exceptionCatched = false;

//when
TreeOperations operations(connection, manager);

try {
operations.getDatabases([](const RedisClient::DatabaseList&){});
} catch (const TreeOperations::Exception& e) {
exceptionCatched = true;
}

//then
QCOMPARE(exceptionCatched, true);
}

void TestTreeOperations::testGetDatabaseKeys()
{
//given
Expand All @@ -101,7 +81,6 @@ void TestTreeOperations::testGetDatabaseKeys()
wait(5);
QCOMPARE(callbackCalled, true);
QCOMPARE(connection->runCommandCalled, runCommandCalled);
QCOMPARE(connection->getServerVersionCalled, 1u);
QCOMPARE(connection->retrieveCollectionCalled, retrieveCollectionCalled);
}

Expand Down
1 change: 0 additions & 1 deletion tests/unit_tests/testcases/app/test_treeoperations.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ private slots:
void testCreation();

void testGetDatabases();
void testGetDatabasesOnOldRedis();

void testGetDatabaseKeys();
void testGetDatabaseKeys_data();
Expand Down