Merge lp:~adam-collard/landscape-client/assert-python-26 into lp:~landscape/landscape-client/trunk

[Adam Collard]

Replace use of assertIs* with assertTrue and use of is statement to maintain Python 2.6 compatibility.

Replace use of assertIs* with assertTrue and use of is statement to maintain Python 2.6 compatibility.

[Geoff Teale (tealeg)]

+1 Looks awesome.

review: Approve

[Alberto Donato (ack)]

+1!

review: Approve

=== modified file 'landscape/monitor/tests/test_plugin.py'
--- landscape/monitor/tests/test_plugin.py	2013-07-12 13:41:07 +0000
+++ landscape/monitor/tests/test_plugin.py	2013-08-22 14:16:26 +0000
@@ -76,7 +76,7 @@
         plugin.persist.set("hi", "there")
         self.assertEqual(self.monitor.persist.get("wubble"), {"hi": "there"})
         self.reactor.fire("resynchronize")
-        self.assertIsNone(self.monitor.persist.get("wubble"))
+        self.assertTrue(self.monitor.persist.get("wubble") is None)
 
     def test_resynchronize_with_provided_scope(self):
         """
@@ -90,7 +90,7 @@
         plugin.persist.set("hi", "there")
         self.assertEqual(self.monitor.persist.get("wubble"), {"hi": "there"})
         self.reactor.fire("resynchronize", scopes=["frujical"])
-        self.assertIsNone(self.monitor.persist.get("wubble"))
+        self.assertTrue(self.monitor.persist.get("wubble") is None)
 
     def test_do_not_resynchronize_with_other_scope(self):
         """

=== modified file 'landscape/package/tests/test_changer.py'
--- landscape/package/tests/test_changer.py	2013-07-16 13:15:03 +0000
+++ landscape/package/tests/test_changer.py	2013-08-22 14:16:26 +0000
@@ -1494,7 +1494,7 @@
         Invoking L{PackageChanger.run} results in the session ID being fetched.
         """
         def assert_session_id(ignored):
-            self.assertIsNotNone(self.changer._session_id)
+            self.assertTrue(self.changer._session_id is not None)
 
         self.changer._session_id = None
         result = self.changer.run()