Merge branch 'release-0.7.x'

reviewboard · Nov 7, 2016 · 33f32a4 · 33f32a4
2 parents 4210468 + 97abb07
commit 33f32a4
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/rbtools/commands/tests/test_post.py b/rbtools/commands/tests/test_post.py
@@ -72,11 +72,10 @@ def test_wrong_argument_entry(self):
         description and rbt post --field testing_done='No tests'
         """
         post = self._create_post_command(['testing_done=No tests'])
-        self.assertIsNone(post.options.testing_done)
+        self.assertEqual(post.options.testing_done, None)
         post = self._create_post_command(['description'])
 
-        with self.assertRaises(CommandError):
-            post.post_process_options()
+        self.assertRaises(CommandError, post.post_process_options)
 
     def test_multiple_delimiter(self):
         """Testing multiple delimiters with rbt post --field
@@ -96,5 +95,4 @@ def test_arg_field_set_again_by_custom_fields(self):
         post = self._create_post_command(['description=test'])
         post.options.description = 'test'
 
-        with self.assertRaises(CommandError):
-            post.post_process_options()
+        self.assertRaises(CommandError, post.post_process_options)