Repository: ambari
Updated Branches:
  refs/heads/trunk 65611067b -> c52c180a3


AMBARI-7810 TestAlerts fails when executed with python2.6 (jaoki)


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

Branch: refs/heads/trunk
Commit: c52c180a3fe0376292e2d58b6f267530b5074d7f
Parents: 6561106
Author: jaoki <[email protected]>
Authored: Mon Oct 20 22:18:46 2014 -0700
Committer: jaoki <[email protected]>
Committed: Mon Oct 20 22:18:46 2014 -0700

----------------------------------------------------------------------
 ambari-agent/src/test/python/ambari_agent/TestAlerts.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/c52c180a/ambari-agent/src/test/python/ambari_agent/TestAlerts.py
----------------------------------------------------------------------
diff --git a/ambari-agent/src/test/python/ambari_agent/TestAlerts.py 
b/ambari-agent/src/test/python/ambari_agent/TestAlerts.py
index 1bacf24..78f3e10 100644
--- a/ambari-agent/src/test/python/ambari_agent/TestAlerts.py
+++ b/ambari-agent/src/test/python/ambari_agent/TestAlerts.py
@@ -256,7 +256,7 @@ class TestAlerts(TestCase):
 
     res = pa.collect()
     
-    self.assertIsNotNone(collector.alerts()[0])
+    self.assertTrue(collector.alerts()[0] is not None)
     self.assertEquals('CRITICAL', collector.alerts()[0]['state'])
     
     collector.remove_by_uuid('c1f73191-4481-4435-8dae-fd380e4c0be1')
@@ -354,4 +354,4 @@ class TestAlerts(TestCase):
     
     # execute the alert immediately and verify that the collector has the 
result
     ash.execute_alert(execution_commands)
-    self.assertEquals(1, len(ash._collector.alerts()))
\ No newline at end of file
+    self.assertEquals(1, len(ash._collector.alerts()))

Reply via email to