Skip to content

Commit d2fbdb8

Browse files
author
Sean Cribbs
committed
Loosen the version restriction if Riak is on a prerelease version.
1 parent 47a5eba commit d2fbdb8

File tree

2 files changed

+16
-5
lines changed

2 files changed

+16
-5
lines changed

riak/tests/test_feature_detection.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,5 +86,16 @@ def test_12(self):
8686
self.assertTrue(t.tombstone_vclocks())
8787
self.assertTrue(t.pb_head())
8888

89+
def test_12_loose(self):
90+
t = DummyTransport("1.2.1p3")
91+
self.assertTrue(t.phaseless_mapred())
92+
self.assertTrue(t.pb_indexes())
93+
self.assertTrue(t.pb_search())
94+
self.assertTrue(t.pb_conditionals())
95+
self.assertTrue(t.quorum_controls())
96+
self.assertTrue(t.tombstone_vclocks())
97+
self.assertTrue(t.pb_head())
98+
99+
89100
if __name__ == '__main__':
90101
unittest.main()

riak/transports/feature_detect.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
under the License.
1717
"""
1818

19-
from distutils.version import StrictVersion
19+
from distutils.version import LooseVersion
2020
from riak.util import lazy_property
2121

2222

2323
versions = {
24-
1: StrictVersion("1.0.0"),
25-
1.1: StrictVersion("1.1.0"),
26-
1.2: StrictVersion("1.2.0")
24+
1: LooseVersion("1.0.0"),
25+
1.1: LooseVersion("1.1.0"),
26+
1.2: LooseVersion("1.2.0")
2727
}
2828

2929

@@ -92,4 +92,4 @@ def pb_head(self):
9292

9393
@lazy_property
9494
def server_version(self):
95-
return StrictVersion(self._server_version())
95+
return LooseVersion(self._server_version())

0 commit comments

Comments
 (0)