[Qemu-devel] [PATCH] iotests: remove assertIsNotNone call

[Qemu-devel] [PATCH] iotests: remove assertIsNotNone call

[John Snow]

RHEL6 doesn't have Python 2.7, so replace this call with
assertNotEqual(x, None) which will work just as well.

Reported-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: John Snow <jsnow@redhat.com>
---
 tests/qemu-iotests/124 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/qemu-iotests/124 b/tests/qemu-iotests/124
index 3ee78cd..8abce2f 100644
--- a/tests/qemu-iotests/124
+++ b/tests/qemu-iotests/124
@@ -125,7 +125,7 @@ class TestIncrementalBackup(iotests.QMPTestCase):
 
         event = self.vm.event_wait(name="BLOCK_JOB_COMPLETED",
                                    match={'data': {'device': kwargs['device']}})
-        self.assertIsNotNone(event)
+        self.assertNotEqual(event, None)
 
         try:
             failure = self.dictpath(event, 'data/error')
-- 
2.1.0

Re: [Qemu-devel] [Qemu-block] [PATCH] iotests: remove assertIsNotNone call

[Stefan Hajnoczi]

[-- Attachment #1: Type: text/plain, Size: 419 bytes --]

On Fri, May 22, 2015 at 12:01:41PM -0400, John Snow wrote:
> RHEL6 doesn't have Python 2.7, so replace this call with
> assertNotEqual(x, None) which will work just as well.
> 
> Reported-by: Kevin Wolf <kwolf@redhat.com>
> Signed-off-by: John Snow <jsnow@redhat.com>
> ---
>  tests/qemu-iotests/124 | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>

[-- Attachment #2: Type: application/pgp-signature, Size: 473 bytes --]

Re: [Qemu-devel] [PATCH] iotests: remove assertIsNotNone call

[Kevin Wolf]

Am 22.05.2015 um 18:01 hat John Snow geschrieben:
> RHEL6 doesn't have Python 2.7, so replace this call with
> assertNotEqual(x, None) which will work just as well.
> 
> Reported-by: Kevin Wolf <kwolf@redhat.com>
> Signed-off-by: John Snow <jsnow@redhat.com>

Thanks, applied to the block branch.

Kevin