Skip to content
Merged
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
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ install:
- pip install tox
- pip install coveralls
- mkdir influxdb_install
- wget https://dl.influxdata.com/influxdb/releases/influxdb_0.13.0_amd64.deb
- wget https://dl.influxdata.com/influxdb/releases/influxdb_1.1.0_amd64.deb
- dpkg -x influxdb*.deb influxdb_install
script:
- export INFLUXDB_PYTHON_INFLUXD_PATH=$(pwd)/influxdb_install/usr/bin/influxd
Expand Down
6 changes: 3 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ InfluxDB is an open-source distributed time series database, find more about Inf

.. _installation:

InfluxDB v0.8.X users
=====================
InfluxDB pre v1.1.0 users
=========================

InfluxDB 0.9 was released and it is the new recommended version. However, InfluxDB 0.8.x users may still use the legacy client by using ``from influxdb.influxdb08 import InfluxDBClient`` instead.
InfluxDB 1.1.0 was released and it is the new recommended version. InfluxDB 0.8.x users may still use the legacy client by using ``from influxdb.influxdb08 import InfluxDBClient`` instead.

Installation
============
Expand Down
44 changes: 25 additions & 19 deletions influxdb/tests/server_tests/client_test_with_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -431,8 +431,8 @@ def test_default_retention_policy(self):
rsp = self.cli.get_list_retention_policies()
self.assertEqual(
[
{'name': 'default',
'duration': '0',
{'name': 'autogen',
'duration': '0s',
'replicaN': 1,
'shardGroupDuration': u'168h0m0s',
'default': True}
Expand All @@ -447,11 +447,11 @@ def test_create_retention_policy_default(self):

self.assertEqual(
[
{'duration': '0',
{'duration': '0s',
'default': False,
'replicaN': 1,
'shardGroupDuration': u'168h0m0s',
'name': 'default'},
'name': 'autogen'},
{'duration': '24h0m0s',
'default': True,
'replicaN': 1,
Expand All @@ -468,14 +468,17 @@ def test_create_retention_policy_default(self):

def test_create_retention_policy(self):
self.cli.create_retention_policy('somename', '1d', 1)
# NB: creating a retention policy without specifying
# shard group duration
# leads to a shard group duration of 1 hour
rsp = self.cli.get_list_retention_policies()
self.assertEqual(
[
{'duration': '0',
{'duration': '0s',
'default': True,
'replicaN': 1,
'shardGroupDuration': u'168h0m0s',
'name': 'default'},
'name': 'autogen'},
{'duration': '24h0m0s',
'default': False,
'replicaN': 1,
Expand All @@ -491,18 +494,19 @@ def test_alter_retention_policy(self):
# Test alter duration
self.cli.alter_retention_policy('somename', 'db',
duration='4d')
# NB: altering retention policy doesn't change shard group duration
rsp = self.cli.get_list_retention_policies()
self.assertEqual(
[
{'duration': '0',
{'duration': '0s',
'default': True,
'replicaN': 1,
'shardGroupDuration': u'168h0m0s',
'name': 'default'},
'name': 'autogen'},
{'duration': '96h0m0s',
'default': False,
'replicaN': 1,
'shardGroupDuration': u'24h0m0s',
'shardGroupDuration': u'1h0m0s',
'name': 'somename'}
],
rsp
Expand All @@ -511,18 +515,19 @@ def test_alter_retention_policy(self):
# Test alter replication
self.cli.alter_retention_policy('somename', 'db',
replication=4)
# NB: altering retention policy doesn't change shard group duration
rsp = self.cli.get_list_retention_policies()
self.assertEqual(
[
{'duration': '0',
{'duration': '0s',
'default': True,
'replicaN': 1,
'shardGroupDuration': u'168h0m0s',
'name': 'default'},
'name': 'autogen'},
{'duration': '96h0m0s',
'default': False,
'replicaN': 4,
'shardGroupDuration': u'24h0m0s',
'shardGroupDuration': u'1h0m0s',
'name': 'somename'}
],
rsp
Expand All @@ -531,18 +536,19 @@ def test_alter_retention_policy(self):
# Test alter default
self.cli.alter_retention_policy('somename', 'db',
default=True)
# NB: altering retention policy doesn't change shard group duration
rsp = self.cli.get_list_retention_policies()
self.assertEqual(
[
{'duration': '0',
{'duration': '0s',
'default': False,
'replicaN': 1,
'shardGroupDuration': u'168h0m0s',
'name': 'default'},
'name': 'autogen'},
{'duration': '96h0m0s',
'default': True,
'replicaN': 4,
'shardGroupDuration': u'24h0m0s',
'shardGroupDuration': u'1h0m0s',
'name': 'somename'}
],
rsp
Expand All @@ -558,11 +564,11 @@ def test_alter_retention_policy_invalid(self):
rsp = self.cli.get_list_retention_policies()
self.assertEqual(
[
{'duration': '0',
{'duration': '0s',
'default': True,
'replicaN': 1,
'shardGroupDuration': u'168h0m0s',
'name': 'default'},
'name': 'autogen'},
{'duration': '24h0m0s',
'default': False,
'replicaN': 1,
Expand All @@ -580,11 +586,11 @@ def test_drop_retention_policy(self):
rsp = self.cli.get_list_retention_policies()
self.assertEqual(
[
{'duration': '0',
{'duration': '0s',
'default': True,
'replicaN': 1,
'shardGroupDuration': u'168h0m0s',
'name': 'default'}
'name': 'autogen'}
],
rsp
)
Expand Down