diff options
author | Kenny Woodson <kwoodson@redhat.com> | 2017-03-07 16:39:52 -0500 |
---|---|---|
committer | Kenny Woodson <kwoodson@redhat.com> | 2017-03-07 16:39:52 -0500 |
commit | e2bad8efff2aaee4906575bc523c57bffa924715 (patch) | |
tree | 56905b6f8d7b3dbaf2e122940885aab0b97eb94a /roles/lib_openshift/src/test/unit/test_oc_adm_router.py | |
parent | de554f408404502319f8bccc8e51f8ab3e7b2ed6 (diff) | |
download | openshift-e2bad8efff2aaee4906575bc523c57bffa924715.tar.gz openshift-e2bad8efff2aaee4906575bc523c57bffa924715.tar.bz2 openshift-e2bad8efff2aaee4906575bc523c57bffa924715.tar.xz openshift-e2bad8efff2aaee4906575bc523c57bffa924715.zip |
Fix to OpenshiftCLIConfig to support an ordereddict. This was breaking test cases.
Diffstat (limited to 'roles/lib_openshift/src/test/unit/test_oc_adm_router.py')
-rwxr-xr-x | roles/lib_openshift/src/test/unit/test_oc_adm_router.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/roles/lib_openshift/src/test/unit/test_oc_adm_router.py b/roles/lib_openshift/src/test/unit/test_oc_adm_router.py index 410ae3bd4..5184990e8 100755 --- a/roles/lib_openshift/src/test/unit/test_oc_adm_router.py +++ b/roles/lib_openshift/src/test/unit/test_oc_adm_router.py @@ -344,7 +344,6 @@ class RouterTest(unittest.TestCase): (0, '', ''), ] - mock_tmpfile_copy.side_effect = [ '/tmp/mocked_kubeconfig', ] @@ -362,10 +361,10 @@ class RouterTest(unittest.TestCase): mock.call(['oc', 'get', 'secret', 'router-certs', '-o', 'json', '-n', 'default'], None), mock.call(['oc', 'get', 'clusterrolebinding', 'router-router-role', '-o', 'json', '-n', 'default'], None), mock.call(['oc', 'adm', 'router', 'router', '-n', 'default', '--external-host-insecure=False', '--replicas=2', '--selector=type=infra', '--stats-port=1936', '--service-account=router', '--expose-metrics=False', '--ports=80:80,443:443', '--dry-run=True', '-o', 'json', '-n', 'default'], None), - mock.call(['oc', 'create', '-f', '/tmp/ClusterRoleBindingyDm_yh', '-n', 'default'], None), - mock.call(['oc', 'create', '-f', '/tmp/ServiceAccountbzYs4o', '-n', 'default'], None), - mock.call(['oc', 'create', '-f', '/tmp/ServiceWfYdjg', '-n', 'default'], None), - mock.call(['oc', 'create', '-f', '/tmp/DeploymentConfigxfIFpn', '-n', 'default'], None)]) + mock.call(['oc', 'create', '-f', mock.ANY, '-n', 'default'], None), + mock.call(['oc', 'create', '-f', mock.ANY, '-n', 'default'], None), + mock.call(['oc', 'create', '-f', mock.ANY, '-n', 'default'], None), + mock.call(['oc', 'create', '-f', mock.ANY, '-n', 'default'], None)]) @unittest.skipIf(six.PY3, 'py2 test only') @mock.patch('os.path.exists') |