From 8c7920ddf022a8f7588a8de520ffb71b66fa49b0 Mon Sep 17 00:00:00 2001
From: TerryHowe <terrylhowe@gmail.com>
Date: Wed, 8 Jul 2015 10:38:35 -0600
Subject: [PATCH] Remove testing of cliff command line options

These options are part of cliff, let cliff test them.

Change-Id: I802c25ba80048607eef6909a21709dcda63231cc
---
 openstackclient/tests/network/common.py       | 27 -------------------
 .../tests/network/v2/test_network.py          |  8 +++---
 2 files changed, 4 insertions(+), 31 deletions(-)

diff --git a/openstackclient/tests/network/common.py b/openstackclient/tests/network/common.py
index 7162f97bd3..31fde257a1 100644
--- a/openstackclient/tests/network/common.py
+++ b/openstackclient/tests/network/common.py
@@ -33,30 +33,3 @@ class TestNetworkBase(utils.TestCommand):
             service_type="network",
         )
         self.api = self.app.client_manager.network.api
-
-    given_show_options = [
-        '-f',
-        'shell',
-        '-c',
-        'id',
-        '--prefix',
-        'TST',
-    ]
-    then_show_options = [
-        ('formatter', 'shell'),
-        ('columns', ['id']),
-        ('prefix', 'TST'),
-    ]
-    given_list_options = [
-        '-f',
-        'csv',
-        '-c',
-        'id',
-        '--quote',
-        'all',
-    ]
-    then_list_options = [
-        ('formatter', 'csv'),
-        ('columns', ['id']),
-        ('quote_mode', 'all'),
-    ]
diff --git a/openstackclient/tests/network/v2/test_network.py b/openstackclient/tests/network/v2/test_network.py
index 36133a3bb8..87a4406662 100644
--- a/openstackclient/tests/network/v2/test_network.py
+++ b/openstackclient/tests/network/v2/test_network.py
@@ -92,14 +92,14 @@ class TestCreateNetwork(common.TestNetworkBase):
             "--project", identity_fakes_v3.project_name,
             "--project-domain", identity_fakes_v3.domain_name,
             FAKE_NAME,
-        ] + self.given_show_options
+        ]
         verifylist = [
             ('admin_state', False),
             ('shared', True),
             ('project', identity_fakes_v3.project_name),
             ('project_domain', identity_fakes_v3.domain_name),
             ('name', FAKE_NAME),
-        ] + self.then_show_options
+        ]
         mocker = mock.Mock(return_value=copy.deepcopy(RESPONSE))
         self.app.client_manager.network.create_network = mocker
         identity_client = identity_fakes_v3.FakeIdentityv3Client(
@@ -519,8 +519,8 @@ class TestShowNetwork(common.TestNetworkBase):
         self.assertEqual(FILTERED, result)
 
     def test_show_all_options(self, n_mock):
-        arglist = [FAKE_NAME] + self.given_show_options
-        verifylist = [('identifier', FAKE_NAME)] + self.then_show_options
+        arglist = [FAKE_NAME]
+        verifylist = [('identifier', FAKE_NAME)]
         n_mock.return_value = copy.deepcopy(RECORD)
         self.cmd = network.ShowNetwork(self.app, self.namespace)