ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From oleew...@apache.org
Subject [46/50] [abbrv] ambari git commit: AMBARI-20332. Few ambari agent unit tests are failing (aonishuk)
Date Thu, 09 Mar 2017 16:40:15 GMT
AMBARI-20332. Few ambari agent unit tests are failing (aonishuk)


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

Branch: refs/heads/branch-dev-logsearch
Commit: 95833865c3b2bb006ae44b355a3c597bd2cef3d7
Parents: e1cdfe4
Author: Andrew Onishuk <aonishuk@hortonworks.com>
Authored: Thu Mar 9 16:31:01 2017 +0200
Committer: Andrew Onishuk <aonishuk@hortonworks.com>
Committed: Thu Mar 9 16:31:01 2017 +0200

----------------------------------------------------------------------
 .../resource_management/TestDatanodeHelper.py       | 16 ++++++++--------
 .../stacks/2.0.6/YARN/test_yarn_service_check.py    |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/95833865/ambari-agent/src/test/python/resource_management/TestDatanodeHelper.py
----------------------------------------------------------------------
diff --git a/ambari-agent/src/test/python/resource_management/TestDatanodeHelper.py b/ambari-agent/src/test/python/resource_management/TestDatanodeHelper.py
index f22c8e9..071bd05 100644
--- a/ambari-agent/src/test/python/resource_management/TestDatanodeHelper.py
+++ b/ambari-agent/src/test/python/resource_management/TestDatanodeHelper.py
@@ -176,46 +176,46 @@ class TestDatanodeHelper(TestCase):
     # folder should be managed
     dirs_unmounted=set()
     self.assertEquals(True, mounted_dirs_helper._may_manage_folder(dir_='/grid/0/data', last_mount_point_for_dir=None,
is_non_root_dir=False, dirs_unmounted=dirs_unmounted, error_messages = [], manage_dirs_on_root
= True, curr_mount_point = '/'))
-    self.assertSetEqual(dirs_unmounted, set())
+    self.assertEquals(dirs_unmounted, set())
 
     # root, no history file, manage_dirs_on_root = False
     # folder should not be managed
     dirs_unmounted=set()
     self.assertEquals(False, mounted_dirs_helper._may_manage_folder(dir_='/grid/0/data',
last_mount_point_for_dir=None, is_non_root_dir=False, dirs_unmounted=dirs_unmounted, error_messages
= [], manage_dirs_on_root = False, curr_mount_point = '/'))
-    self.assertSetEqual(dirs_unmounted, set(['/grid/0/data']))
+    self.assertEquals(dirs_unmounted, set(['/grid/0/data']))
 
     # non root, no history file, manage_dirs_on_root = False
     # folder should be managed
     dirs_unmounted=set()
     self.assertEquals(True, mounted_dirs_helper._may_manage_folder(dir_='/grid/0/data', last_mount_point_for_dir=None,
is_non_root_dir=True, dirs_unmounted=dirs_unmounted, error_messages = [], manage_dirs_on_root
= False, curr_mount_point = '/'))
-    self.assertSetEqual(dirs_unmounted, set())
+    self.assertEquals(dirs_unmounted, set())
 
     # unmounted to root, manage_dirs_on_root = True
     # folder should not be managed
     dirs_unmounted=set()
     self.assertEquals(False, mounted_dirs_helper._may_manage_folder('/grid/0/data', '/grid/0',
True, dirs_unmounted, [], False, '/'))
-    self.assertSetEqual(dirs_unmounted, set(['/grid/0/data']))
+    self.assertEquals(dirs_unmounted, set(['/grid/0/data']))
 
     # unmounted to root, manage_dirs_on_root = False
     # folder should not be managed
     dirs_unmounted=set()
     self.assertEquals(False, mounted_dirs_helper._may_manage_folder(dir_='/grid/0/data',
last_mount_point_for_dir='/grid/0/data', is_non_root_dir=False, dirs_unmounted=dirs_unmounted,
error_messages = [], manage_dirs_on_root = False, curr_mount_point = '/'))
-    self.assertSetEqual(dirs_unmounted, set(['/grid/0/data']))
+    self.assertEquals(dirs_unmounted, set(['/grid/0/data']))
 
     # same mount = root, manage_dirs_on_root = False
     # folder should not be managed
     dirs_unmounted=set()
     self.assertEquals(False, mounted_dirs_helper._may_manage_folder(dir_='/grid/0/data',
last_mount_point_for_dir='/', is_non_root_dir=False, dirs_unmounted=dirs_unmounted, error_messages
= [], manage_dirs_on_root = False, curr_mount_point = '/'))
-    self.assertSetEqual(dirs_unmounted, set())
+    self.assertEquals(dirs_unmounted, set())
 
     # same mount = root, manage_dirs_on_root = True
     # folder should be managed
     dirs_unmounted=set()
     self.assertEquals(True, mounted_dirs_helper._may_manage_folder(dir_='/grid/0/data', last_mount_point_for_dir='/',
is_non_root_dir=False, dirs_unmounted=dirs_unmounted, error_messages = [], manage_dirs_on_root
= True, curr_mount_point = '/'))
-    self.assertSetEqual(dirs_unmounted, set())
+    self.assertEquals(dirs_unmounted, set())
 
     # mount changed to non root, manage_dirs_on_root = False
     # folder should not be managed
     dirs_unmounted=set()
     self.assertEquals(False, mounted_dirs_helper._may_manage_folder('/grid/0/data', '/',
True, dirs_unmounted, [], False, '/grid/0'))
-    self.assertSetEqual(dirs_unmounted, set(['/grid/0/data']))
+    self.assertEquals(dirs_unmounted, set(['/grid/0/data']))

http://git-wip-us.apache.org/repos/asf/ambari/blob/95833865/ambari-server/src/test/python/stacks/2.0.6/YARN/test_yarn_service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_yarn_service_check.py b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_yarn_service_check.py
index fe7456d..fa40f60 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_yarn_service_check.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_yarn_service_check.py
@@ -99,4 +99,4 @@ class TestServiceCheck(RMFTestCase):
         self.assertNoMoreResources()
 
   def assertCurlCallForwardsCredentialsOnRedirect(self, mock_curl_call):
-    self.assertIn('--location-trusted', mock_curl_call.call_args[0][0])
+    self.assertTrue('--location-trusted' in mock_curl_call.call_args[0][0])


Mime
View raw message