You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2014/11/15 03:22:54 UTC

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

Repository: ambari
Updated Branches:
  refs/heads/trunk 88b29ea2d -> bb546c6da


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


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bb546c6d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bb546c6d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bb546c6d

Branch: refs/heads/trunk
Commit: bb546c6da653cd644930e76db6e0d08d629cfebe
Parents: 88b29ea
Author: Yusaku Sako <yu...@hortonworks.com>
Authored: Fri Nov 14 18:22:28 2014 -0800
Committer: Yusaku Sako <yu...@hortonworks.com>
Committed: Fri Nov 14 18:22:28 2014 -0800

----------------------------------------------------------------------
 ambari-server/src/test/python/stacks/1.3.2/HDFS/test_namenode.py  | 2 +-
 .../src/test/python/stacks/1.3.2/HDFS/test_service_check.py       | 3 +--
 ambari-server/src/test/python/stacks/1.3.2/HDFS/test_snamenode.py | 2 +-
 .../src/test/python/stacks/1.3.2/OOZIE/test_service_check.py      | 2 +-
 .../src/test/python/stacks/2.0.6/HDFS/test_journalnode.py         | 2 +-
 ambari-server/src/test/python/stacks/2.0.6/HDFS/test_namenode.py  | 2 +-
 .../src/test/python/stacks/2.0.6/HDFS/test_service_check.py       | 3 +--
 ambari-server/src/test/python/stacks/2.0.6/HDFS/test_snamenode.py | 2 +-
 ambari-server/src/test/python/stacks/2.0.6/HDFS/test_zkfc.py      | 2 +-
 .../src/test/python/stacks/2.0.6/OOZIE/test_service_check.py      | 3 +--
 10 files changed, 10 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/bb546c6d/ambari-server/src/test/python/stacks/1.3.2/HDFS/test_namenode.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/HDFS/test_namenode.py b/ambari-server/src/test/python/stacks/1.3.2/HDFS/test_namenode.py
index 26e1f7f..49ad368 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/HDFS/test_namenode.py
+++ b/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):
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/bb546c6d/ambari-server/src/test/python/stacks/1.3.2/HDFS/test_service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/HDFS/test_service_check.py b/ambari-server/src/test/python/stacks/1.3.2/HDFS/test_service_check.py
index 40acf58..353745d 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/HDFS/test_service_check.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/ambari/blob/bb546c6d/ambari-server/src/test/python/stacks/1.3.2/HDFS/test_snamenode.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/HDFS/test_snamenode.py b/ambari-server/src/test/python/stacks/1.3.2/HDFS/test_snamenode.py
index 1ae1bd7..8f65f11 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/HDFS/test_snamenode.py
+++ b/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):
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/bb546c6d/ambari-server/src/test/python/stacks/1.3.2/OOZIE/test_service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/OOZIE/test_service_check.py b/ambari-server/src/test/python/stacks/1.3.2/OOZIE/test_service_check.py
index 9c863e0..bc56e2a 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/OOZIE/test_service_check.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/ambari/blob/bb546c6d/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_journalnode.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_journalnode.py b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_journalnode.py
index 70fc3e8..91446d2 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_journalnode.py
+++ b/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):
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/bb546c6d/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_namenode.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_namenode.py b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_namenode.py
index 3a576eb..2e12e19 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_namenode.py
+++ b/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

http://git-wip-us.apache.org/repos/asf/ambari/blob/bb546c6d/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_service_check.py b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_service_check.py
index 96b1739..3c87346 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_service_check.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/ambari/blob/bb546c6d/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_snamenode.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_snamenode.py b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_snamenode.py
index 47e174a..d77164b 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_snamenode.py
+++ b/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):
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/bb546c6d/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_zkfc.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_zkfc.py b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_zkfc.py
index 81bfce9..16d3f19 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_zkfc.py
+++ b/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):
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/bb546c6d/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_service_check.py b/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_service_check.py
index 8f9d915..2c8165c 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_service_check.py
+++ b/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):