diff options
| author | Andrew Butcher <abutcher@afrolegs.com> | 2017-02-27 16:13:05 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-27 16:13:05 -0500 |
| commit | 0550138a592bc3bf202a44ed9a3e4d575e70add3 (patch) | |
| tree | 9deb78cc4e324a01706d22f72de8240e98c505dd /roles/lib_openshift/src/test/unit/test_oc_env.py | |
| parent | 833eb4ccfed255004ba21b51bab3c022201bbc83 (diff) | |
| parent | 3c44e4293825b8f3aafa80bb60599476de3be57d (diff) | |
| download | openshift-0550138a592bc3bf202a44ed9a3e4d575e70add3.tar.gz openshift-0550138a592bc3bf202a44ed9a3e4d575e70add3.tar.bz2 openshift-0550138a592bc3bf202a44ed9a3e4d575e70add3.tar.xz openshift-0550138a592bc3bf202a44ed9a3e4d575e70add3.zip | |
Merge pull request #3510 from abutcher/router-upgrade
Bug 1427080: The router wasn't upgraded to current ose-haproxy-router image version
Diffstat (limited to 'roles/lib_openshift/src/test/unit/test_oc_env.py')
| -rwxr-xr-x | roles/lib_openshift/src/test/unit/test_oc_env.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/roles/lib_openshift/src/test/unit/test_oc_env.py b/roles/lib_openshift/src/test/unit/test_oc_env.py index dab5099c2..45a3ef1eb 100755 --- a/roles/lib_openshift/src/test/unit/test_oc_env.py +++ b/roles/lib_openshift/src/test/unit/test_oc_env.py @@ -147,7 +147,7 @@ class OCEnvTest(unittest.TestCase): # Making sure our mocks were called as we expected mock_cmd.assert_has_calls([ - mock.call(['oc', '-n', 'default', 'get', 'dc', 'router', '-o', 'json'], None), + mock.call(['oc', 'get', 'dc', 'router', '-o', 'json', '-n', 'default'], None), ]) @mock.patch('oc_env.locate_oc_binary') @@ -333,7 +333,7 @@ class OCEnvTest(unittest.TestCase): # Making sure our mocks were called as we expected mock_cmd.assert_has_calls([ - mock.call(['oc', '-n', 'default', 'get', 'dc', 'router', '-o', 'json'], None), + mock.call(['oc', 'get', 'dc', 'router', '-o', 'json', '-n', 'default'], None), ]) @mock.patch('oc_env.locate_oc_binary') @@ -448,7 +448,7 @@ class OCEnvTest(unittest.TestCase): # Making sure our mocks were called as we expected mock_cmd.assert_has_calls([ - mock.call(['oc', '-n', 'default', 'get', 'dc', 'router', '-o', 'json'], None), + mock.call(['oc', 'get', 'dc', 'router', '-o', 'json', '-n', 'default'], None), ]) @unittest.skipIf(six.PY3, 'py2 test only') |