Merge lp:~sylvain-pineau/checkbox/fix-python3.5-unittest into lp:checkbox

[Sylvain Pineau]

Fix the suspend/resume unit tests after replacing the unittest CamelCase methods names with their underscore versions.

[lp:~sylvain-pineau/checkbox/fix-python3.5-unittest]

3963. By Zygmunt Krynicki on 2015-08-28

"automatic merge of lp:~zyga/checkbox/fix-developer-decorators/ by tarmac [r=kissiel][bug=][author=zyga]"

3964. By Maciej Kisielewski on 2015-08-28

"automatic merge of lp:~kissiel/checkbox/session-assistant-improvements/ by tarmac [r=zyga][bug=][author=kissiel]"

3965. By Maciej Kisielewski on 2015-08-28

"automatic merge of lp:~kissiel/checkbox/session-assistant-improvements/ by tarmac [r=zyga][bug=][author=kissiel]"

[Zygmunt Krynicki (zyga)]

Let's land this and iterate.

review: Approve

[lp:~sylvain-pineau/checkbox/fix-python3.5-unittest]

3966. By Sylvain Pineau on 2015-08-28

"automatic merge of lp:~sylvain-pineau/checkbox/fix-python3.5-unittest/ by tarmac [r=zyga][bug=][author=sylvain-pineau]"

=== modified file 'plainbox/plainbox/impl/secure/providers/test_v1.py'
--- plainbox/plainbox/impl/secure/providers/test_v1.py	2015-08-03 09:25:27 +0000
+++ plainbox/plainbox/impl/secure/providers/test_v1.py	2015-08-28 10:02:28 +0000
@@ -98,7 +98,7 @@
     def test_existing_directories_work(self, mock_isdir):
         mock_isdir.return_value = True
         self.assertEqual(self.validator(self.variable, self._PATH), None)
-        mock_isdir.assertCalledWith(self._PATH)
+        mock_isdir.assert_called_with(self._PATH)
 
     @mock.patch('os.path.isdir')
     def test_missing_directories_dont(self, mock_isdir):
@@ -106,7 +106,7 @@
         self.assertEqual(
             self.validator(self.variable, self._PATH),
             "no such directory")
-        mock_isdir.assertCalledWith(self._PATH)
+        mock_isdir.assert_called_with(self._PATH)
 
 
 class AbsolutePathValidatorTests(TestCase):
 
=== modified file 'plainbox/plainbox/impl/session/test_resume.py'
--- plainbox/plainbox/impl/session/test_resume.py	2015-08-24 20:10:03 +0000
+++ plainbox/plainbox/impl/session/test_resume.py	2015-08-28 10:02:28 +0000
@@ -126,7 +126,7 @@
             b'{"app_blob":null,"flags":[],"running_job_name":null,"title":null'
             b'},"results":{}},"version":1}')
         SessionResumeHelper([], None, None).resume(data)
-        mocked_helper1.resume_json.assertCalledOnce()
+        mocked_helper1.resume_json.assert_called_once()
 
     @mock.patch('plainbox.impl.session.resume.SessionResumeHelper2')
     def test_resume_dispatch_v2(self, mocked_helper2):
@@ -135,7 +135,7 @@
             b'{"app_blob":null,"flags":[],"running_job_name":null,"title":null'
             b'},"results":{}},"version":2}')
         SessionResumeHelper([], None, None).resume(data)
-        mocked_helper2.resume_json.assertCalledOnce()
+        mocked_helper2.resume_json.assert_called_once()
 
     @mock.patch('plainbox.impl.session.resume.SessionResumeHelper3')
     def test_resume_dispatch_v3(self, mocked_helper3):
@@ -145,7 +145,7 @@
             b'"running_job_name":null,"title":null'
             b'},"results":{}},"version":3}')
         SessionResumeHelper([], None, None).resume(data)
-        mocked_helper3.resume_json.assertCalledOnce()
+        mocked_helper3.resume_json.assert_called_once()
 
     @mock.patch('plainbox.impl.session.resume.SessionResumeHelper4')
     def test_resume_dispatch_v4(self, mocked_helper4):
@@ -155,7 +155,7 @@
             b'"running_job_name":null,"title":null'
             b'},"results":{}},"version":4}')
         SessionResumeHelper([], None, None).resume(data)
-        mocked_helper4.resume_json.assertCalledOnce()
+        mocked_helper4.resume_json.assert_called_once()
 
     @mock.patch('plainbox.impl.session.resume.SessionResumeHelper5')
     def test_resume_dispatch_v5(self, mocked_helper5):
@@ -165,7 +165,7 @@
             b'"running_job_name":null,"title":null'
             b'},"results":{}},"version":5}')
         SessionResumeHelper([], None, None).resume(data)
-        mocked_helper5.resume_json.assertCalledOnce()
+        mocked_helper5.resume_json.assert_called_once()
 
     @mock.patch('plainbox.impl.session.resume.SessionResumeHelper6')
     def test_resume_dispatch_v6(self, mocked_helper6):
@@ -175,7 +175,7 @@
             b'"running_job_name":null,"title":null'
             b'},"results":{}},"version":6}')
         SessionResumeHelper([], None, None).resume(data)
-        mocked_helper6.resume_json.assertCalledOnce()
+        mocked_helper6.resume_json.assert_called_once()
 
     def test_resume_dispatch_v7(self):
         data = gzip.compress(
@@ -194,7 +194,7 @@
             b'{"app_blob":null,"flags":[],"running_job_name":null,"title":null'
             b'},"results":{}},"version":1}')
         SessionPeekHelper().peek(data)
-        mocked_helper1.resume_json.assertCalledOnce()
+        mocked_helper1.resume_json.assert_called_once()
 
     @mock.patch('plainbox.impl.session.resume.SessionPeekHelper2')
     def test_peek_dispatch_v2(self, mocked_helper2):
@@ -203,7 +203,7 @@
             b'{"app_blob":null,"flags":[],"running_job_name":null,"title":null'
             b'},"results":{}},"version":2}')
         SessionPeekHelper().peek(data)
-        mocked_helper2.resume_json.assertCalledOnce()
+        mocked_helper2.resume_json.assert_called_once()
 
     @mock.patch('plainbox.impl.session.resume.SessionPeekHelper3')
     def test_peek_dispatch_v3(self, mocked_helper3):
@@ -212,7 +212,7 @@
             b'{"app_blob":null,"flags":[],"running_job_name":null,"title":null'
             b'},"results":{}},"version":3}')
         SessionPeekHelper().peek(data)
-        mocked_helper3.resume_json.assertCalledOnce()
+        mocked_helper3.resume_json.assert_called_once()
 
     @mock.patch('plainbox.impl.session.resume.SessionPeekHelper4')
     def test_peek_dispatch_v4(self, mocked_helper4):
@@ -221,7 +221,7 @@
             b'{"app_blob":null,"flags":[],"running_job_name":null,"title":null'
             b'},"results":{}},"version":4}')
         SessionPeekHelper().peek(data)
-        mocked_helper4.resume_json.assertCalledOnce()
+        mocked_helper4.resume_json.assert_called_once()
 
     @mock.patch('plainbox.impl.session.resume.SessionPeekHelper5')
     def test_peek_dispatch_v5(self, mocked_helper5):
@@ -230,7 +230,7 @@
             b'{"app_blob":null,"flags":[],"running_job_name":null,"title":null'
             b'},"results":{}},"version":5}')
         SessionPeekHelper().peek(data)
-        mocked_helper5.resume_json.assertCalledOnce()
+        mocked_helper5.resume_json.assert_called_once()
 
     @mock.patch('plainbox.impl.session.resume.SessionPeekHelper6')
     def test_peek_dispatch_v6(self, mocked_helper6):
@@ -239,7 +239,7 @@
             b'{"app_blob":null,"flags":[],"running_job_name":null,"title":null'
             b'},"results":{}},"version":6}')
         SessionPeekHelper().peek(data)
-        mocked_helper6.resume_json.assertCalledOnce()
+        mocked_helper6.resume_json.assert_called_once()
 
 class SessionResumeTests(TestCase):
 
@@ -430,8 +430,8 @@
         """
         with mock.patch.object(self.helper, attribute='_build_SessionState'):
             self.helper._build_SessionState(self.session_repr)
-            self.helper._build_SessionState.assertCalledOnceWith(
-                self.session_repr, None)
+            self.helper._build_SessionState.assert_called_once_with(
+                self.session_repr)
 
     def test_calls_restore_SessionState_jobs_and_results(self):
         """
@@ -439,11 +439,14 @@
         _build_SessionState().
         """
         mpo = mock.patch.object
-        with mpo(self.helper, '_build_SessionState'), \
-                mpo(self.helper, '_restore_SessionState_jobs_and_results'):
+        with mpo(self.helper, '_restore_SessionState_jobs_and_results'), \
+                mpo(self.helper, '_restore_SessionState_metadata'), \
+                mpo(self.helper, '_restore_SessionState_job_list'), \
+                mpo(self.helper, '_restore_SessionState_mandatory_job_list'), \
+                mpo(self.helper, '_restore_SessionState_desired_job_list'):
             session = self.helper._build_SessionState(self.session_repr)
             self.helper._restore_SessionState_jobs_and_results. \
-                assertCalledOnceWith(session, self.session_repr)
+                assert_called_once_with(session, self.session_repr)
 
     def test_calls_restore_SessionState_metadata(self):
         """
@@ -451,11 +454,14 @@
         _build_SessionState().
         """
         mpo = mock.patch.object
-        with mpo(self.helper, '_build_SessionState'), \
-                mpo(self.helper, '_restore_SessionState_metadata'):
+        with mpo(self.helper, '_restore_SessionState_jobs_and_results'), \
+                mpo(self.helper, '_restore_SessionState_metadata'), \
+                mpo(self.helper, '_restore_SessionState_job_list'), \
+                mpo(self.helper, '_restore_SessionState_mandatory_job_list'), \
+                mpo(self.helper, '_restore_SessionState_desired_job_list'):
             session = self.helper._build_SessionState(self.session_repr)
             self.helper._restore_SessionState_metadata. \
-                assertCalledOnceWith(session, self.session_repr)
+                assert_called_once_with(session.metadata, self.session_repr)
 
     def test_calls_restore_SessionState_desired_job_list(self):
         """
@@ -463,11 +469,14 @@
         _build_SessionState().
         """
         mpo = mock.patch.object
-        with mpo(self.helper, '_build_SessionState'), \
+        with mpo(self.helper, '_restore_SessionState_jobs_and_results'), \
+                mpo(self.helper, '_restore_SessionState_metadata'), \
+                mpo(self.helper, '_restore_SessionState_job_list'), \
+                mpo(self.helper, '_restore_SessionState_mandatory_job_list'), \
                 mpo(self.helper, '_restore_SessionState_desired_job_list'):
             session = self.helper._build_SessionState(self.session_repr)
             self.helper._restore_SessionState_desired_job_list. \
-                assertCalledOnceWith(session, self.session_repr)
+                assert_called_once_with(session, self.session_repr)
 
     def test_calls_restore_SessionState_job_list(self):
         """
@@ -475,10 +484,13 @@
         _build_SessionState().
         """
         mpo = mock.patch.object
-        with mpo(self.helper, '_build_SessionState'), \
-                mpo(self.helper, '_restore_SessionState_job_list'):
+        with mpo(self.helper, '_restore_SessionState_jobs_and_results'), \
+                mpo(self.helper, '_restore_SessionState_metadata'), \
+                mpo(self.helper, '_restore_SessionState_job_list'), \
+                mpo(self.helper, '_restore_SessionState_mandatory_job_list'), \
+                mpo(self.helper, '_restore_SessionState_desired_job_list'):
             session = self.helper._build_SessionState(self.session_repr)
-            self.helper._restore_SessionState_job_list.assertCalledOnceWith(
+            self.helper._restore_SessionState_job_list.assert_called_once_with(
                 session, self.session_repr)
 
 
 
=== modified file 'plainbox/plainbox/impl/session/test_suspend.py'
--- plainbox/plainbox/impl/session/test_suspend.py	2015-08-20 11:17:46 +0000
+++ plainbox/plainbox/impl/session/test_suspend.py	2015-08-28 10:02:28 +0000
@@ -217,25 +217,29 @@
         data = self.helper._repr_IOLogRecord(record)
         self.assertEqual(data, [0.0, "stdout", "YmluYXJ5IGRhdGE="])
 
-    @mock.patch('plainbox.impl.session.suspend.SessionSuspendHelper')
-    def test_repr_JobResult_with_MemoryJobResult(self, mocked_helper):
+    def test_repr_JobResult_with_MemoryJobResult(self):
         """
         verify that _repr_JobResult() called with MemoryJobResult
         calls _repr_MemoryJobResult
         """
-        result = MemoryJobResult({})
-        self.helper._repr_JobResult(result, self.session_dir)
-        mocked_helper._repr_MemoryJobResult.assertCalledOnceWith(result)
+        mpo = mock.patch.object
+        with mpo(self.helper, '_repr_MemoryJobResult'):
+            result = MemoryJobResult({})
+            self.helper._repr_JobResult(result, self.session_dir)
+            self.helper._repr_MemoryJobResult.assert_called_once_with(
+                result, None)
 
-    @mock.patch('plainbox.impl.session.suspend.SessionSuspendHelper')
-    def test_repr_JobResult_with_DiskJobResult(self, mocked_helper):
+    def test_repr_JobResult_with_DiskJobResult(self):
         """
         verify that _repr_JobResult() called with DiskJobResult
         calls _repr_DiskJobResult
         """
-        result = DiskJobResult({})
-        self.helper._repr_JobResult(result, self.session_dir)
-        mocked_helper._repr_DiskJobResult.assertCalledOnceWith(result)
+        mpo = mock.patch.object
+        with mpo(self.helper, '_repr_DiskJobResult'):
+            result = DiskJobResult({})
+            self.helper._repr_JobResult(result, self.session_dir)
+            self.helper._repr_DiskJobResult.assert_called_once_with(
+                result, None)
 
     def test_repr_JobResult_with_junk(self):
         """