1 files changed, 3 insertions, 23 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..2f416c05e 100755
--- a/roles/lib_openshift/src/test/unit/test_oc_env.py
+++ b/roles/lib_openshift/src/test/unit/test_oc_env.py
@@ -1,14 +1,6 @@
-#!/usr/bin/env python2
 '''
  Unit tests for oc_env
 '''
-# To run:
-# ./oc_env.py
-#
-# .
-# Ran 1 test in 0.002s
-#
-# OK
 
 import os
 import six
@@ -32,10 +24,6 @@ class OCEnvTest(unittest.TestCase):
      Test class for OCEnv
     '''
 
-    def setUp(self):
-        ''' setup method will create a file and set to known configuration '''
-        pass
-
     @mock.patch('oc_env.locate_oc_binary')
     @mock.patch('oc_env.Utils.create_tmpfile_copy')
     @mock.patch('oc_env.OCEnv._run')
@@ -147,7 +135,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 +321,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 +436,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')
@@ -558,11 +546,3 @@ class OCEnvTest(unittest.TestCase):
         mock_shutil_which.side_effect = lambda _f, path=None: oc_bin
 
         self.assertEqual(locate_oc_binary(), oc_bin)
-
-    def tearDown(self):
-        '''TearDown method'''
-        pass
-
-
-if __name__ == "__main__":
-    unittest.main()