AMBARI-8335. Unit Test Failures caused by windows code merge in trunk. (Jayush Luniya via yusaku)

ambari-server/src/test/python/stacks/1.3.2/HDFS/test_namenode.py

@@ -17,9 +17,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 '''
+from stacks.utils.RMFTestCase import *
 from ambari_commons import OSCheck
 from mock.mock import MagicMock, patch
-from stacks.utils.RMFTestCase import *
 
 class TestNamenode(RMFTestCase):
 

ambari-server/src/test/python/stacks/1.3.2/HDFS/test_service_check.py

@@ -17,10 +17,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 '''
-
+from stacks.utils.RMFTestCase import *
 import resource_management.libraries.functions
 from mock.mock import MagicMock, call, patch
-from stacks.utils.RMFTestCase import *
 
 @patch.object(resource_management.libraries.functions, "get_unique_id_and_date", new = MagicMock(return_value=''))
 class TestServiceCheck(RMFTestCase):

ambari-server/src/test/python/stacks/1.3.2/HDFS/test_snamenode.py

@@ -17,9 +17,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 '''
+from stacks.utils.RMFTestCase import *
 from ambari_commons import OSCheck
 from mock.mock import MagicMock, patch
-from stacks.utils.RMFTestCase import *
 
 class TestSNamenode(RMFTestCase):
 

ambari-server/src/test/python/stacks/1.3.2/OOZIE/test_service_check.py

@@ -18,9 +18,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 '''
 
+from stacks.utils.RMFTestCase import *
 import resource_management.libraries.functions
 from mock.mock import MagicMock, call, patch
-from stacks.utils.RMFTestCase import *
 
 class TestServiceCheck(RMFTestCase):
   def test_service_check_default(self):

ambari-server/src/test/python/stacks/2.0.6/HDFS/test_journalnode.py

@@ -17,9 +17,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 '''
+from stacks.utils.RMFTestCase import *
 from ambari_commons import OSCheck
 from mock.mock import MagicMock, patch
-from stacks.utils.RMFTestCase import *
 
 class TestJournalnode(RMFTestCase):
 

ambari-server/src/test/python/stacks/2.0.6/HDFS/test_namenode.py

@@ -18,9 +18,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 from ambari_commons import OSCheck
 '''
+from stacks.utils.RMFTestCase import *
 from ambari_commons import OSCheck
 from mock.mock import MagicMock, patch
-from stacks.utils.RMFTestCase import *
 import resource_management
 
 import subprocess

ambari-server/src/test/python/stacks/2.0.6/HDFS/test_service_check.py

@@ -17,10 +17,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 '''
-
+from stacks.utils.RMFTestCase import *
 import resource_management.libraries.functions
 from mock.mock import MagicMock, call, patch
-from stacks.utils.RMFTestCase import *
 
 @patch.object(resource_management.libraries.functions, "get_unique_id_and_date", new = MagicMock(return_value=''))
 class TestServiceCheck(RMFTestCase):

ambari-server/src/test/python/stacks/2.0.6/HDFS/test_snamenode.py

@@ -17,9 +17,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 '''
+from stacks.utils.RMFTestCase import *
 from ambari_commons import OSCheck
 from mock.mock import MagicMock, patch
-from stacks.utils.RMFTestCase import *
 
 class TestSNamenode(RMFTestCase):
 

ambari-server/src/test/python/stacks/2.0.6/HDFS/test_zkfc.py

@@ -17,9 +17,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 '''
+from stacks.utils.RMFTestCase import *
 from ambari_commons import OSCheck
 from mock.mock import MagicMock, patch
-from stacks.utils.RMFTestCase import *
 
 class TestZkfc(RMFTestCase):
 

ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_service_check.py

@@ -17,10 +17,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 '''
-
+from stacks.utils.RMFTestCase import *
 import resource_management.libraries.functions
 from mock.mock import MagicMock, call, patch
-from stacks.utils.RMFTestCase import *
 
 class TestServiceCheck(RMFTestCase):
   def test_service_check_default(self):