瀏覽代碼

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

Yusaku Sako 10 年之前
父節點
當前提交
bb546c6da6

+ 1 - 1
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
 See the License for the specific language governing permissions and
 limitations under the License.
 limitations under the License.
 '''
 '''
+from stacks.utils.RMFTestCase import *
 from ambari_commons import OSCheck
 from ambari_commons import OSCheck
 from mock.mock import MagicMock, patch
 from mock.mock import MagicMock, patch
-from stacks.utils.RMFTestCase import *
 
 
 class TestNamenode(RMFTestCase):
 class TestNamenode(RMFTestCase):
 
 

+ 1 - 2
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
 See the License for the specific language governing permissions and
 limitations under the License.
 limitations under the License.
 '''
 '''
-
+from stacks.utils.RMFTestCase import *
 import resource_management.libraries.functions
 import resource_management.libraries.functions
 from mock.mock import MagicMock, call, patch
 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=''))
 @patch.object(resource_management.libraries.functions, "get_unique_id_and_date", new = MagicMock(return_value=''))
 class TestServiceCheck(RMFTestCase):
 class TestServiceCheck(RMFTestCase):

+ 1 - 1
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
 See the License for the specific language governing permissions and
 limitations under the License.
 limitations under the License.
 '''
 '''
+from stacks.utils.RMFTestCase import *
 from ambari_commons import OSCheck
 from ambari_commons import OSCheck
 from mock.mock import MagicMock, patch
 from mock.mock import MagicMock, patch
-from stacks.utils.RMFTestCase import *
 
 
 class TestSNamenode(RMFTestCase):
 class TestSNamenode(RMFTestCase):
 
 

+ 1 - 1
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.
 limitations under the License.
 '''
 '''
 
 
+from stacks.utils.RMFTestCase import *
 import resource_management.libraries.functions
 import resource_management.libraries.functions
 from mock.mock import MagicMock, call, patch
 from mock.mock import MagicMock, call, patch
-from stacks.utils.RMFTestCase import *
 
 
 class TestServiceCheck(RMFTestCase):
 class TestServiceCheck(RMFTestCase):
   def test_service_check_default(self):
   def test_service_check_default(self):

+ 1 - 1
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
 See the License for the specific language governing permissions and
 limitations under the License.
 limitations under the License.
 '''
 '''
+from stacks.utils.RMFTestCase import *
 from ambari_commons import OSCheck
 from ambari_commons import OSCheck
 from mock.mock import MagicMock, patch
 from mock.mock import MagicMock, patch
-from stacks.utils.RMFTestCase import *
 
 
 class TestJournalnode(RMFTestCase):
 class TestJournalnode(RMFTestCase):
 
 

+ 1 - 1
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.
 limitations under the License.
 from ambari_commons import OSCheck
 from ambari_commons import OSCheck
 '''
 '''
+from stacks.utils.RMFTestCase import *
 from ambari_commons import OSCheck
 from ambari_commons import OSCheck
 from mock.mock import MagicMock, patch
 from mock.mock import MagicMock, patch
-from stacks.utils.RMFTestCase import *
 import resource_management
 import resource_management
 
 
 import subprocess
 import subprocess

+ 1 - 2
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
 See the License for the specific language governing permissions and
 limitations under the License.
 limitations under the License.
 '''
 '''
-
+from stacks.utils.RMFTestCase import *
 import resource_management.libraries.functions
 import resource_management.libraries.functions
 from mock.mock import MagicMock, call, patch
 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=''))
 @patch.object(resource_management.libraries.functions, "get_unique_id_and_date", new = MagicMock(return_value=''))
 class TestServiceCheck(RMFTestCase):
 class TestServiceCheck(RMFTestCase):

+ 1 - 1
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
 See the License for the specific language governing permissions and
 limitations under the License.
 limitations under the License.
 '''
 '''
+from stacks.utils.RMFTestCase import *
 from ambari_commons import OSCheck
 from ambari_commons import OSCheck
 from mock.mock import MagicMock, patch
 from mock.mock import MagicMock, patch
-from stacks.utils.RMFTestCase import *
 
 
 class TestSNamenode(RMFTestCase):
 class TestSNamenode(RMFTestCase):
 
 

+ 1 - 1
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
 See the License for the specific language governing permissions and
 limitations under the License.
 limitations under the License.
 '''
 '''
+from stacks.utils.RMFTestCase import *
 from ambari_commons import OSCheck
 from ambari_commons import OSCheck
 from mock.mock import MagicMock, patch
 from mock.mock import MagicMock, patch
-from stacks.utils.RMFTestCase import *
 
 
 class TestZkfc(RMFTestCase):
 class TestZkfc(RMFTestCase):
 
 

+ 1 - 2
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
 See the License for the specific language governing permissions and
 limitations under the License.
 limitations under the License.
 '''
 '''
-
+from stacks.utils.RMFTestCase import *
 import resource_management.libraries.functions
 import resource_management.libraries.functions
 from mock.mock import MagicMock, call, patch
 from mock.mock import MagicMock, call, patch
-from stacks.utils.RMFTestCase import *
 
 
 class TestServiceCheck(RMFTestCase):
 class TestServiceCheck(RMFTestCase):
   def test_service_check_default(self):
   def test_service_check_default(self):