From 39839def2e356e8d145be89380c73a71423cf06d Mon Sep 17 00:00:00 2001
From: Steve Martinelli <s.martinelli@gmail.com>
Date: Mon, 5 Sep 2016 22:14:33 -0700
Subject: move unit tests to new "unit" test module

this will better isolate the unit tests from the functional tests.
unfortunately, the "integration" tests had to be lumped into the
"unit" tests since we need the separation in testr.conf

Change-Id: Ifd12198c1f90e4e3c951c73bfa1884ab300d8ded
---
 openstackclient/tests/common/test_module.py | 130 ----------------------------
 1 file changed, 130 deletions(-)
 delete mode 100644 openstackclient/tests/common/test_module.py

(limited to 'openstackclient/tests/common/test_module.py')

diff --git a/openstackclient/tests/common/test_module.py b/openstackclient/tests/common/test_module.py
deleted file mode 100644
index 8d5bb5f1..00000000
--- a/openstackclient/tests/common/test_module.py
+++ /dev/null
@@ -1,130 +0,0 @@
-#   Copyright 2013 Nebula Inc.
-#
-#   Licensed under the Apache License, Version 2.0 (the "License"); you may
-#   not use this file except in compliance with the License. You may obtain
-#   a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#   License for the specific language governing permissions and limitations
-#   under the License.
-#
-
-"""Test module module"""
-
-import mock
-
-from openstackclient.common import module as osc_module
-from openstackclient.tests import fakes
-from openstackclient.tests import utils
-
-
-# NOTE(dtroyer): module_1 must match the version list filter (not --all)
-#                currently == '*client*'
-module_name_1 = 'fakeclient'
-module_version_1 = '0.1.2'
-MODULE_1 = {
-    '__version__': module_version_1,
-}
-
-module_name_2 = 'zlib'
-module_version_2 = '1.1'
-MODULE_2 = {
-    '__version__': module_version_2,
-}
-
-MODULES = {
-    module_name_1: fakes.FakeModule(module_name_1, module_version_1),
-    module_name_2: fakes.FakeModule(module_name_2, module_version_2),
-}
-
-
-class TestCommandList(utils.TestCommand):
-
-    def setUp(self):
-        super(TestCommandList, self).setUp()
-
-        self.app.command_manager = mock.Mock()
-        self.app.command_manager.get_command_groups.return_value = [
-            'openstack.common'
-        ]
-        self.app.command_manager.get_command_names.return_value = [
-            'limits show\nextension list'
-        ]
-
-        # Get the command object to test
-        self.cmd = osc_module.ListCommand(self.app, None)
-
-    def test_command_list_no_options(self):
-        arglist = []
-        verifylist = []
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-
-        # In base command class Lister in cliff, abstract method take_action()
-        # returns a tuple containing the column names and an iterable
-        # containing the data to be listed.
-        columns, data = self.cmd.take_action(parsed_args)
-
-        # TODO(bapalm): Adjust this when cliff properly supports
-        # handling the detection rather than using the hard-code below.
-        collist = ('Command Group', 'Commands')
-        self.assertEqual(collist, columns)
-        datalist = ((
-            'openstack.common',
-            'limits show\nextension list'
-        ),)
-
-        self.assertEqual(datalist, tuple(data))
-
-
-@mock.patch.dict(
-    'openstackclient.common.module.sys.modules',
-    values=MODULES,
-    clear=True,
-)
-class TestModuleList(utils.TestCommand):
-
-    def setUp(self):
-        super(TestModuleList, self).setUp()
-
-        # Get the command object to test
-        self.cmd = osc_module.ListModule(self.app, None)
-
-    def test_module_list_no_options(self):
-        arglist = []
-        verifylist = [
-            ('all', False),
-        ]
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-
-        # In base command class Lister in cliff, abstract method take_action()
-        # returns a tuple containing the column names and an iterable
-        # containing the data to be listed.
-        columns, data = self.cmd.take_action(parsed_args)
-
-        # Additional modules may be present, just check our additions
-        self.assertIn(module_name_1, columns)
-        self.assertIn(module_version_1, data)
-
-    def test_module_list_all(self):
-        arglist = [
-            '--all',
-        ]
-        verifylist = [
-            ('all', True),
-        ]
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-
-        # In base command class Lister in cliff, abstract method take_action()
-        # returns a tuple containing the column names and an iterable
-        # containing the data to be listed.
-        columns, data = self.cmd.take_action(parsed_args)
-
-        # Additional modules may be present, just check our additions
-        self.assertIn(module_name_1, columns)
-        self.assertIn(module_name_2, columns)
-        self.assertIn(module_version_1, data)
-        self.assertIn(module_version_2, data)
-- 
cgit v1.2.1