From a4fe8bfa6b4122bc1215bcb9798caf1c5eb6d181 Mon Sep 17 00:00:00 2001 From: Kenny Woodson Date: Wed, 1 Mar 2017 11:19:03 -0500 Subject: Fixed tests to align with new naming. --- roles/lib_openshift/src/test/unit/oc_project.py | 126 --------------------- .../lib_openshift/src/test/unit/test_oc_project.py | 126 +++++++++++++++++++++ 2 files changed, 126 insertions(+), 126 deletions(-) delete mode 100755 roles/lib_openshift/src/test/unit/oc_project.py create mode 100755 roles/lib_openshift/src/test/unit/test_oc_project.py (limited to 'roles') diff --git a/roles/lib_openshift/src/test/unit/oc_project.py b/roles/lib_openshift/src/test/unit/oc_project.py deleted file mode 100755 index e3a7eba6f..000000000 --- a/roles/lib_openshift/src/test/unit/oc_project.py +++ /dev/null @@ -1,126 +0,0 @@ -#!/usr/bin/env python2 -''' - Unit tests for oc project -''' -# To run: -# ./oc_secret.py -# -# . -# Ran 1 test in 0.002s -# -# OK - -import os -import sys -import unittest -import mock - -# Removing invalid variable names for tests so that I can -# keep them brief -# pylint: disable=invalid-name,no-name-in-module -# Disable import-error b/c our libraries aren't loaded in jenkins -# pylint: disable=import-error,wrong-import-position -# place class in our python path -module_path = os.path.join('/'.join(os.path.realpath(__file__).split('/')[:-4]), 'library') # noqa: E501 -sys.path.insert(0, module_path) -from oc_project import OCProject # noqa: E402 - - -class OCProjectTest(unittest.TestCase): - ''' - Test class for OCSecret - ''' - - def setUp(self): - ''' setup method will create a file and set to known configuration ''' - pass - - @mock.patch('oc_project.Utils.create_tmpfile_copy') - @mock.patch('oc_project.Utils._write') - @mock.patch('oc_project.OCProject._run') - def test_adding_a_project(self, mock_cmd, mock_write, mock_tmpfile_copy): - ''' Testing adding a project ''' - - # Arrange - - # run_ansible input parameters - params = { - 'state': 'present', - 'display_name': 'operations project', - 'name': 'operations', - 'node_selector': ['ops_only=True'], - 'kubeconfig': '/etc/origin/master/admin.kubeconfig', - 'debug': False, - 'admin': None, - 'admin_role': 'admin', - 'description': 'All things operations project', - } - - project_results = '''{ - "kind": "Project", - "apiVersion": "v1", - "metadata": { - "name": "operations", - "selfLink": "/oapi/v1/projects/operations", - "uid": "5e52afb8-ee33-11e6-89f4-0edc441d9666", - "resourceVersion": "1584", - "labels": {}, - "annotations": { - "openshift.io/node-selector": "ops_only=True", - "openshift.io/sa.initialized-roles": "true", - "openshift.io/sa.scc.mcs": "s0:c3,c2", - "openshift.io/sa.scc.supplemental-groups": "1000010000/10000", - "openshift.io/sa.scc.uid-range": "1000010000/10000" - } - }, - "spec": { - "finalizers": [ - "kubernetes", - "openshift.io/origin" - ] - }, - "status": { - "phase": "Active" - } - }''' - - # Return values of our mocked function call. These get returned once per call. - mock_cmd.side_effect = [ - (1, '', 'Error from server: namespaces "operations" not found'), - (1, '', 'Error from server: namespaces "operations" not found'), - (0, '', ''), # created - (0, project_results, ''), # fetch it - ] - - mock_tmpfile_copy.side_effect = [ - '/tmp/mocked_kubeconfig', - ] - - # Act - - results = OCProject.run_ansible(params, False) - - # Assert - self.assertTrue(results['changed']) - self.assertEqual(results['results']['returncode'], 0) - self.assertEqual(results['results']['results']['metadata']['name'], 'operations') - self.assertEqual(results['state'], 'present') - - # Making sure our mock was called as we expected - mock_cmd.assert_has_calls([ - mock.call(['oc', 'get', 'namespace', 'operations', '-o', 'json'], None), - mock.call(['oc', 'get', 'namespace', 'operations', '-o', 'json'], None), - mock.call(['oadm', 'new-project', 'operations', '--admin-role=admin', - '--display-name=operations project', '--description=All things operations project', - '--node-selector=ops_only=True'], None), - mock.call(['oc', 'get', 'namespace', 'operations', '-o', 'json'], None), - - ]) - - def tearDown(self): - '''TearDown method''' - pass - - -if __name__ == "__main__": - unittest.main() diff --git a/roles/lib_openshift/src/test/unit/test_oc_project.py b/roles/lib_openshift/src/test/unit/test_oc_project.py new file mode 100755 index 000000000..3cc439bf7 --- /dev/null +++ b/roles/lib_openshift/src/test/unit/test_oc_project.py @@ -0,0 +1,126 @@ +#!/usr/bin/env python2 +''' + Unit tests for oc project +''' +# To run: +# ./oc_secret.py +# +# . +# Ran 1 test in 0.002s +# +# OK + +import os +import sys +import unittest +import mock + +# Removing invalid variable names for tests so that I can +# keep them brief +# pylint: disable=invalid-name,no-name-in-module +# Disable import-error b/c our libraries aren't loaded in jenkins +# pylint: disable=import-error,wrong-import-position +# place class in our python path +module_path = os.path.join('/'.join(os.path.realpath(__file__).split('/')[:-4]), 'library') # noqa: E501 +sys.path.insert(0, module_path) +from oc_project import OCProject # noqa: E402 + + +class OCProjectTest(unittest.TestCase): + ''' + Test class for OCSecret + ''' + + def setUp(self): + ''' setup method will create a file and set to known configuration ''' + pass + + @mock.patch('oc_project.Utils.create_tmpfile_copy') + @mock.patch('oc_project.Utils._write') + @mock.patch('oc_project.OCProject._run') + def test_adding_a_project(self, mock_cmd, mock_write, mock_tmpfile_copy): + ''' Testing adding a project ''' + + # Arrange + + # run_ansible input parameters + params = { + 'state': 'present', + 'display_name': 'operations project', + 'name': 'operations', + 'node_selector': ['ops_only=True'], + 'kubeconfig': '/etc/origin/master/admin.kubeconfig', + 'debug': False, + 'admin': None, + 'admin_role': 'admin', + 'description': 'All things operations project', + } + + project_results = '''{ + "kind": "Project", + "apiVersion": "v1", + "metadata": { + "name": "operations", + "selfLink": "/oapi/v1/projects/operations", + "uid": "5e52afb8-ee33-11e6-89f4-0edc441d9666", + "resourceVersion": "1584", + "labels": {}, + "annotations": { + "openshift.io/node-selector": "ops_only=True", + "openshift.io/sa.initialized-roles": "true", + "openshift.io/sa.scc.mcs": "s0:c3,c2", + "openshift.io/sa.scc.supplemental-groups": "1000010000/10000", + "openshift.io/sa.scc.uid-range": "1000010000/10000" + } + }, + "spec": { + "finalizers": [ + "kubernetes", + "openshift.io/origin" + ] + }, + "status": { + "phase": "Active" + } + }''' + + # Return values of our mocked function call. These get returned once per call. + mock_cmd.side_effect = [ + (1, '', 'Error from server: namespaces "operations" not found'), + (1, '', 'Error from server: namespaces "operations" not found'), + (0, '', ''), # created + (0, project_results, ''), # fetch it + ] + + mock_tmpfile_copy.side_effect = [ + '/tmp/mocked_kubeconfig', + ] + + # Act + + results = OCProject.run_ansible(params, False) + + # Assert + self.assertTrue(results['changed']) + self.assertEqual(results['results']['returncode'], 0) + self.assertEqual(results['results']['results']['metadata']['name'], 'operations') + self.assertEqual(results['state'], 'present') + + # Making sure our mock was called as we expected + mock_cmd.assert_has_calls([ + mock.call(['oc', 'get', 'namespace', 'operations', '-o', 'json'], None), + mock.call(['oc', 'get', 'namespace', 'operations', '-o', 'json'], None), + mock.call(['oc', 'adm', 'new-project', 'operations', '--admin-role=admin', + '--display-name=operations project', '--description=All things operations project', + '--node-selector=ops_only=True'], None), + mock.call(['oc', 'get', 'namespace', 'operations', '-o', 'json'], None), + + ]) + + def tearDown(self): + '''TearDown method''' + pass + + +if __name__ == "__main__": + unittest.main() -- cgit v1.2.1