Description: Skip tests that are also failing upstream.
Author: Corey Bryant <corey.bryant@canonical.com>
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1749244
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1784728

Index: python-cinderclient/cinderclient/tests/unit/test_shell.py
===================================================================
--- python-cinderclient.orig/cinderclient/tests/unit/test_shell.py
+++ python-cinderclient/cinderclient/tests/unit/test_shell.py
@@ -245,6 +245,7 @@ class ShellTest(utils.TestCase):
 
         self.assertEqual(False, _shell.cs.client.verify_cert)
 
+    @unittest.skip("bug/1749244: Skipped by Ubuntu")
     @mock.patch.object(cinderclient.client.SessionClient, 'authenticate',
                        side_effect=exceptions.Unauthorized('No'))
     def test_session_client_debug_logger(self, mock_session):
Index: python-cinderclient/cinderclient/tests/unit/v3/test_shell.py
===================================================================
--- python-cinderclient.orig/cinderclient/tests/unit/v3/test_shell.py
+++ python-cinderclient/cinderclient/tests/unit/v3/test_shell.py
@@ -44,6 +44,8 @@ import mock
 from requests_mock.contrib import fixture as requests_mock_fixture
 import six
 from six.moves.urllib import parse
+import sys
+import testtools
 
 import cinderclient
 from cinderclient import base
@@ -114,6 +116,8 @@ class ShellTest(utils.TestCase):
 
         self.assert_called('GET', url)
 
+    @testtools.skipIf(sys.version_info.major == 3 and sys.version_info.minor == 7,
+                      "bug/1784728: Skipped by Ubuntu, tests fail for Python 3.7")
     @ddt.data(
         # testcases for list volume
         {'command':