Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[submodule "riak_pb"]
path = riak_pb
url = git://github.com/basho/riak_pb.git
url = https://github.com/basho/riak_pb.git
[submodule "tools"]
path = tools
url = git://github.com/basho/riak-client-tools.git
url = https://github.com/basho/riak-client-tools.git
[submodule "docs"]
path = docs
url = https://github.com/basho/riak-python-client.git
Expand Down
14 changes: 14 additions & 0 deletions riak/tests/test_transports_tcp_transport.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import unittest

from riak.transports.tcp import TcpTransport
from riak.node import RiakNode


class TransportsTCPTransportTests(unittest.TestCase):
def test__server_version(self):
node = RiakNode()
transport = TcpTransport(node=node)
transport.get_server_info = lambda: {'server_version': '2.1.2'}
self.assertEqual('2.1.2', transport._server_version())
transport.get_server_info = lambda: {'server_version': '3.0'}
self.assertEqual('3.0', transport._server_version())
11 changes: 1 addition & 10 deletions riak/transports/tcp/transport.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,16 +93,7 @@ def _get_codec(self, msg_code):
# FeatureDetection API
def _server_version(self):
server_info = self.get_server_info()
ver = server_info['server_version']
(maj, min, patch) = [int(v) for v in ver.split('.')]
if maj == 0:
import datetime
now = datetime.datetime.now()
if now.year == 2016:
# GH-471 As of 20160509 Riak TS OSS 1.3.0 returns '0.8.0' as
# the version string.
return '2.1.1'
return ver
return server_info['server_version']

def ping(self):
"""
Expand Down