Rolled back changes to retention policy duration.

mdbartos · mdbartos · commit c3832a1d6141 · 2016-08-29T16:57:52.000-04:00
diff --git a/influxdb/tests/misc.py b/influxdb/tests/misc.py
@@ -5,11 +5,7 @@
 from __future__ import print_function
 from __future__ import unicode_literals
 
-import os
-import sys
-import subprocess
 import socket
-import distutils
 
 
 def get_free_ports(num_ports, ip='127.0.0.1'):
@@ -48,29 +44,3 @@ def is_port_open(port, ip='127.0.0.1'):
         return result == 0
     finally:
         sock.close()
-
-
-def find_influxd_path():
-    influxdb_bin_path = os.environ.get(
-        'INFLUXDB_PYTHON_INFLUXD_PATH',
-        None
-    )
-
-    if influxdb_bin_path is None:
-        influxdb_bin_path = distutils.spawn.find_executable('influxd')
-        if not influxdb_bin_path:
-            try:
-                influxdb_bin_path = subprocess.check_output(
-                    ['which', 'influxd']
-                ).strip()
-            except subprocess.CalledProcessError:
-                # fallback on :
-                influxdb_bin_path = '/opt/influxdb/influxd'
-
-    if not os.path.isfile(influxdb_bin_path):
-        raise unittest.SkipTest("Could not find influxd binary")
-
-    version = subprocess.check_output([influxdb_bin_path, 'version'])
-    print("InfluxDB version: %s" % version, file=sys.stderr)
-
-    return influxdb_bin_path
diff --git a/influxdb/tests/server_tests/client_test_with_server.py b/influxdb/tests/server_tests/client_test_with_server.py
@@ -19,7 +19,6 @@
 import time
 import unittest
 import warnings
-import subprocess
 
 # By default, raise exceptions on warnings
 warnings.simplefilter('error', FutureWarning)
@@ -30,23 +29,13 @@
 from influxdb.tests import skipIfPYpy, using_pypy, skipServerTests
 from influxdb.tests.server_tests.base import ManyTestCasesWithServerMixin
 from influxdb.tests.server_tests.base import SingleTestCaseWithServerMixin
-from influxdb.tests.misc import find_influxd_path
 
 if not using_pypy:
     import pandas as pd
     from pandas.util.testing import assert_frame_equal
 
 
 THIS_DIR = os.path.abspath(os.path.dirname(__file__))
-INFLUXDB_BIN_PATH = find_influxd_path()
-INFLUXDB_VERSION = (subprocess.check_output([INFLUXDB_BIN_PATH, 'version'])
-                    .split()[1])
-
-# Version-specific differences between 0.9 and 0.13
-if (INFLUXDB_VERSION.split(b'.')[:2] == [b'v0', b'13']):
-    rp_duration = '0s'
-elif (INFLUXDB_VERSION.split(b'.')[:2] == [b'v0', b'9']):
-    rp_duration = '0'
 
 
 def point(serie_name, timestamp=None, tags=None, **fields):
@@ -458,7 +447,7 @@ def test_default_retention_policy(self):
         self.assertEqual(
             [
                 {'name': 'default',
-                 'duration': rp_duration,
+                 'duration': '0',
                  'replicaN': 1,
                  'shardGroupDuration': u'168h0m0s',
                  'default': True}
@@ -473,7 +462,7 @@ def test_create_retention_policy_default(self):
 
         self.assertEqual(
             [
-                {'duration': rp_duration,
+                {'duration': '0',
                  'default': False,
                  'replicaN': 1,
                  'shardGroupDuration': u'168h0m0s',
@@ -497,7 +486,7 @@ def test_create_retention_policy(self):
         rsp = self.cli.get_list_retention_policies()
         self.assertEqual(
             [
-                {'duration': rp_duration,
+                {'duration': '0',
                  'default': True,
                  'replicaN': 1,
                  'shardGroupDuration': u'168h0m0s',
@@ -520,7 +509,7 @@ def test_alter_retention_policy(self):
         rsp = self.cli.get_list_retention_policies()
         self.assertEqual(
             [
-                {'duration': rp_duration,
+                {'duration': '0',
                  'default': True,
                  'replicaN': 1,
                  'shardGroupDuration': u'168h0m0s',
@@ -540,7 +529,7 @@ def test_alter_retention_policy(self):
         rsp = self.cli.get_list_retention_policies()
         self.assertEqual(
             [
-                {'duration': rp_duration,
+                {'duration': '0',
                  'default': True,
                  'replicaN': 1,
                  'shardGroupDuration': u'168h0m0s',
@@ -560,7 +549,7 @@ def test_alter_retention_policy(self):
         rsp = self.cli.get_list_retention_policies()
         self.assertEqual(
             [
-                {'duration': rp_duration,
+                {'duration': '0',
                  'default': False,
                  'replicaN': 1,
                  'shardGroupDuration': u'168h0m0s',
@@ -584,7 +573,7 @@ def test_alter_retention_policy_invalid(self):
         rsp = self.cli.get_list_retention_policies()
         self.assertEqual(
             [
-                {'duration': rp_duration,
+                {'duration': '0',
                  'default': True,
                  'replicaN': 1,
                  'shardGroupDuration': u'168h0m0s',
@@ -606,7 +595,7 @@ def test_drop_retention_policy(self):
         rsp = self.cli.get_list_retention_policies()
         self.assertEqual(
             [
-                {'duration': rp_duration,
+                {'duration': '0',
                  'default': True,
                  'replicaN': 1,
                  'shardGroupDuration': u'168h0m0s',
