summaryrefslogtreecommitdiffstats
path: root/roles/lib_openshift/src/test/unit/test_oc_serviceaccount_secret.py
diff options
context:
space:
mode:
authorAndrew Butcher <abutcher@afrolegs.com>2017-02-27 16:13:05 -0500
committerGitHub <noreply@github.com>2017-02-27 16:13:05 -0500
commit0550138a592bc3bf202a44ed9a3e4d575e70add3 (patch)
tree9deb78cc4e324a01706d22f72de8240e98c505dd /roles/lib_openshift/src/test/unit/test_oc_serviceaccount_secret.py
parent833eb4ccfed255004ba21b51bab3c022201bbc83 (diff)
parent3c44e4293825b8f3aafa80bb60599476de3be57d (diff)
downloadopenshift-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_serviceaccount_secret.py')
-rwxr-xr-xroles/lib_openshift/src/test/unit/test_oc_serviceaccount_secret.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/roles/lib_openshift/src/test/unit/test_oc_serviceaccount_secret.py b/roles/lib_openshift/src/test/unit/test_oc_serviceaccount_secret.py
index ab8ccd18c..d78349e34 100755
--- a/roles/lib_openshift/src/test/unit/test_oc_serviceaccount_secret.py
+++ b/roles/lib_openshift/src/test/unit/test_oc_serviceaccount_secret.py
@@ -181,10 +181,10 @@ secrets:
# Making sure our mocks were called as we expected
mock_cmd.assert_has_calls([
- mock.call(['oc', '-n', 'default', 'get', 'sa', 'builder', '-o', 'json'], None),
- mock.call(['oc', '-n', 'default', 'get', 'sa', 'builder', '-o', 'json'], None),
- mock.call(['oc', '-n', 'default', 'replace', '-f', mock.ANY], None),
- mock.call(['oc', '-n', 'default', 'get', 'sa', 'builder', '-o', 'json'], None)
+ mock.call(['oc', 'get', 'sa', 'builder', '-o', 'json', '-n', 'default'], None),
+ mock.call(['oc', 'get', 'sa', 'builder', '-o', 'json', '-n', 'default'], None),
+ mock.call(['oc', 'replace', '-f', mock.ANY, '-n', 'default'], None),
+ mock.call(['oc', 'get', 'sa', 'builder', '-o', 'json', '-n', 'default'], None)
])
yaml_file = builder_pyyaml_file
@@ -304,9 +304,9 @@ secrets:
# Making sure our mocks were called as we expected
mock_cmd.assert_has_calls([
- mock.call(['oc', '-n', 'default', 'get', 'sa', 'builder', '-o', 'json'], None),
- mock.call(['oc', '-n', 'default', 'get', 'sa', 'builder', '-o', 'json'], None),
- mock.call(['oc', '-n', 'default', 'replace', '-f', mock.ANY], None),
+ mock.call(['oc', 'get', 'sa', 'builder', '-o', 'json', '-n', 'default'], None),
+ mock.call(['oc', 'get', 'sa', 'builder', '-o', 'json', '-n', 'default'], None),
+ mock.call(['oc', 'replace', '-f', mock.ANY, '-n', 'default'], None),
])
yaml_file = builder_pyyaml_file