Remove condition: check client series will always be true.

All CI test runners are >= xenial. The condition will always be true.

zaza/openstack/charm_tests/rabbitmq_server/tests.py

@@ -26,11 +26,7 @@ import zaza.openstack.charm_tests.test_utils as test_utils
 import zaza.openstack.utilities.generic as generic_utils
 
 from charmhelpers.core.host import CompareHostReleases
-
-from zaza.openstack.utilities.generic import (
-    get_series,
-    get_client_series,
-)
+from zaza.openstack.utilities.generic import get_series
 
 from . import utils as rmq_utils
 from .utils import RmqNoMessageException
@@ -169,8 +165,7 @@ class RmqTests(test_utils.OpenStackBaseTest):
         units = zaza.model.get_units(self.application_name)
 
         # http://pad.lv/1625044
-        if (CompareHostReleases(get_client_series()) >= 'xenial' and
-                CompareHostReleases(get_series(units[0])) <= 'trusty'):
+        if CompareHostReleases(get_series(units[0])) <= 'trusty':
             logging.info('SKIP')
             logging.info('Skipping SSL tests due to client'
                          ' compatibility issues')
@@ -192,8 +187,7 @@ class RmqTests(test_utils.OpenStackBaseTest):
         units = zaza.model.get_units(self.application_name)
 
         # http://pad.lv/1625044
-        if (CompareHostReleases(get_client_series()) >= 'xenial' and
-                CompareHostReleases(get_series(units[0])) <= 'trusty'):
+        if CompareHostReleases(get_series(units[0])) <= 'trusty':
             logging.info('SKIP')
             logging.info('Skipping SSL tests due to client'
                          ' compatibility issues')

zaza/openstack/utilities/generic.py

@@ -22,7 +22,6 @@ import telnetlib
 import yaml
 
 from zaza import model
-from charmhelpers.core.host import lsb_release
 from zaza.openstack.utilities import juju as juju_utils
 from zaza.openstack.utilities import exceptions as zaza_exceptions
 from zaza.openstack.utilities.os_versions import UBUNTU_OPENSTACK_RELEASE
@@ -797,8 +796,3 @@ def get_series(unit):
     result = model.run_on_unit(unit.entity_id,
                                "lsb_release -cs")
     return result['Stdout'].strip()
-
-
-def get_client_series():
-    """Ubuntu release name of machine running this function."""
-    return lsb_release()['DISTRIB_CODENAME']