[4/9] iotests: use octal numbers for python3 compatibility

Message ID	20171219173425.8113-5-f4bug@amsat.org
State	New
Headers	show Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <f4bug@amsat.org> To: Kevin Wolf <kwolf@redhat.com>, Max Reitz <mreitz@redhat.com>, Cleber Rosa <crosa@redhat.com>, Eduardo Habkost <ehabkost@redhat.com>, =?utf-8?b?THVrw6HFoSBEb2t0b3I=?= <ldoktor@redhat.com>, "Daniel P . Berrange" <berrange@redhat.com>, Eric Blake <eblake@redhat.com>, Stefan Hajnoczi <stefanha@redhat.com>, Fam Zheng <famz@redhat.com>, Markus Armbruster <armbru@redhat.com> Date: Tue, 19 Dec 2017 14:34:20 -0300 Message-Id: <20171219173425.8113-5-f4bug@amsat.org> In-Reply-To: <20171219173425.8113-1-f4bug@amsat.org> References: <20171219173425.8113-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH 4/9] iotests: use octal numbers for python3 compatibility Precedence: list Cc: Janosch Frank <frankja@linux.vnet.ibm.com>, qemu-block@nongnu.org, Nir Soffer <nirsof@gmail.com>, Ishani Chugh <chugh.ishani@research.iiit.ac.in>, =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= <f4bug@amsat.org>, qemu-devel@nongnu.org, Paolo Bonzini <pbonzini@redhat.com>, John Snow <jsnow@redhat.com> Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>
Series	iotests: python3 compatibility \| expand [0/9] iotests: python3 compatibility [1/9] qemu.py: replace iteritems() by items() for python3 compatibility [2/9] qmp.py: encode JSON unicode as byte strings for python3 compatibility [3/9] iotests: replace print statement by print() function for python3 compatibility [4/9] iotests: use octal numbers for python3 compatibility [5/9] iotests: replace xrange() by range() for python3 compatibility [6/9] iotests: replace dict.has_key() by 'in' operator for python3 compatibility [7/9] iotests: replace lambda function by lambda expression for python3 compatibility [8/9] iotests: replace assertEquals() by assertEqual() for python3 compatibility [9/9] iotests.py: use io.StringIO with python3

Message ID

20171219173425.8113-5-f4bug@amsat.org

State

New

Headers

From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <f4bug@amsat.org>
To: Kevin Wolf <kwolf@redhat.com>, Max Reitz <mreitz@redhat.com>, Cleber Rosa
	<crosa@redhat.com>, Eduardo Habkost <ehabkost@redhat.com>, 
	=?utf-8?b?THVrw6HFoSBEb2t0b3I=?= <ldoktor@redhat.com>,
	"Daniel P . Berrange" <berrange@redhat.com>, Eric Blake
	<eblake@redhat.com>, Stefan Hajnoczi <stefanha@redhat.com>, Fam Zheng
	<famz@redhat.com>, Markus Armbruster <armbru@redhat.com>
Date: Tue, 19 Dec 2017 14:34:20 -0300
Message-Id: <20171219173425.8113-5-f4bug@amsat.org>
In-Reply-To: <20171219173425.8113-1-f4bug@amsat.org>
References: <20171219173425.8113-1-f4bug@amsat.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Subject: [Qemu-devel] [PATCH 4/9] iotests: use octal numbers for python3
	compatibility
Precedence: list
Cc: Janosch Frank <frankja@linux.vnet.ibm.com>, qemu-block@nongnu.org, Nir
	Soffer <nirsof@gmail.com>, Ishani Chugh
	<chugh.ishani@research.iiit.ac.in>, =?utf-8?q?Philippe_Mathieu-Daud?=
	=?utf-8?b?w6k=?= <f4bug@amsat.org>, qemu-devel@nongnu.org,
	Paolo Bonzini <pbonzini@redhat.com>, 	John Snow <jsnow@redhat.com>
Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org
Sender: "Qemu-devel"
	<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>

Series

iotests: python3 compatibility | expand

Comments

Daniel P. Berrangé Dec. 20, 2017, 10:05 a.m. UTC | #1

On Tue, Dec 19, 2017 at 02:34:20PM -0300, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
>  tests/qemu-iotests/118 | 24 ++++++++++++------------
>  1 file changed, 12 insertions(+), 12 deletions(-)

Reviewed-by: Daniel P. Berrange <berrange@redhat.com>


> 
> diff --git a/tests/qemu-iotests/118 b/tests/qemu-iotests/118
> index 8a9e838c90..3cf21218f0 100755
> --- a/tests/qemu-iotests/118
> +++ b/tests/qemu-iotests/118
> @@ -417,14 +417,14 @@ class TestChangeReadOnly(ChangeBaseClass):
>  
>      def tearDown(self):
>          self.vm.shutdown()
> -        os.chmod(old_img, 0666)
> -        os.chmod(new_img, 0666)
> +        os.chmod(old_img, 0o666)
> +        os.chmod(new_img, 0o666)
>          os.remove(old_img)
>          os.remove(new_img)
>  
>      def test_ro_ro_retain(self):
> -        os.chmod(old_img, 0444)
> -        os.chmod(new_img, 0444)
> +        os.chmod(old_img, 0o444)
> +        os.chmod(new_img, 0o444)
>          self.vm.add_drive(old_img, 'media=disk,read-only=on', 'floppy')
>          self.vm.launch()
>  
> @@ -443,7 +443,7 @@ class TestChangeReadOnly(ChangeBaseClass):
>          self.assert_qmp(result, 'return[0]/inserted/image/filename', new_img)
>  
>      def test_ro_rw_retain(self):
> -        os.chmod(old_img, 0444)
> +        os.chmod(old_img, 0o444)
>          self.vm.add_drive(old_img, 'media=disk,read-only=on', 'floppy')
>          self.vm.launch()
>  
> @@ -462,7 +462,7 @@ class TestChangeReadOnly(ChangeBaseClass):
>          self.assert_qmp(result, 'return[0]/inserted/image/filename', new_img)
>  
>      def test_rw_ro_retain(self):
> -        os.chmod(new_img, 0444)
> +        os.chmod(new_img, 0o444)
>          self.vm.add_drive(old_img, 'media=disk', 'floppy')
>          self.vm.launch()
>  
> @@ -483,7 +483,7 @@ class TestChangeReadOnly(ChangeBaseClass):
>          self.assert_qmp(result, 'return[0]/inserted/image/filename', old_img)
>  
>      def test_ro_rw(self):
> -        os.chmod(old_img, 0444)
> +        os.chmod(old_img, 0o444)
>          self.vm.add_drive(old_img, 'media=disk,read-only=on', 'floppy')
>          self.vm.launch()
>  
> @@ -503,7 +503,7 @@ class TestChangeReadOnly(ChangeBaseClass):
>          self.assert_qmp(result, 'return[0]/inserted/image/filename', new_img)
>  
>      def test_rw_ro(self):
> -        os.chmod(new_img, 0444)
> +        os.chmod(new_img, 0o444)
>          self.vm.add_drive(old_img, 'media=disk', 'floppy')
>          self.vm.launch()
>  
> @@ -542,7 +542,7 @@ class TestChangeReadOnly(ChangeBaseClass):
>          self.assert_qmp(result, 'return[0]/inserted/image/filename', new_img)
>  
>      def test_make_ro_rw(self):
> -        os.chmod(new_img, 0444)
> +        os.chmod(new_img, 0o444)
>          self.vm.add_drive(old_img, 'media=disk', 'floppy')
>          self.vm.launch()
>  
> @@ -562,7 +562,7 @@ class TestChangeReadOnly(ChangeBaseClass):
>          self.assert_qmp(result, 'return[0]/inserted/image/filename', old_img)
>  
>      def test_make_rw_ro_by_retain(self):
> -        os.chmod(old_img, 0444)
> +        os.chmod(old_img, 0o444)
>          self.vm.add_drive(old_img, 'media=disk,read-only=on', 'floppy')
>          self.vm.launch()
>  
> @@ -581,7 +581,7 @@ class TestChangeReadOnly(ChangeBaseClass):
>          self.assert_qmp(result, 'return[0]/inserted/image/filename', new_img)
>  
>      def test_make_ro_rw_by_retain(self):
> -        os.chmod(new_img, 0444)
> +        os.chmod(new_img, 0o444)
>          self.vm.add_drive(old_img, 'media=disk', 'floppy')
>          self.vm.launch()
>  
> @@ -600,7 +600,7 @@ class TestChangeReadOnly(ChangeBaseClass):
>          self.assert_qmp(result, 'return[0]/inserted/image/filename', old_img)
>  
>      def test_rw_ro_cycle(self):
> -        os.chmod(new_img, 0444)
> +        os.chmod(new_img, 0o444)
>          self.vm.add_drive(old_img, 'media=disk', 'floppy')
>          self.vm.launch()
>  
> -- 
> 2.15.1
> 

Regards,
Daniel

diff --git a/tests/qemu-iotests/118 b/tests/qemu-iotests/118
index 8a9e838c90..3cf21218f0 100755
--- a/tests/qemu-iotests/118
+++ b/tests/qemu-iotests/118
@@ -417,14 +417,14 @@  class TestChangeReadOnly(ChangeBaseClass):
 
     def tearDown(self):
         self.vm.shutdown()
-        os.chmod(old_img, 0666)
-        os.chmod(new_img, 0666)
+        os.chmod(old_img, 0o666)
+        os.chmod(new_img, 0o666)
         os.remove(old_img)
         os.remove(new_img)
 
     def test_ro_ro_retain(self):
-        os.chmod(old_img, 0444)
-        os.chmod(new_img, 0444)
+        os.chmod(old_img, 0o444)
+        os.chmod(new_img, 0o444)
         self.vm.add_drive(old_img, 'media=disk,read-only=on', 'floppy')
         self.vm.launch()
 
@@ -443,7 +443,7 @@  class TestChangeReadOnly(ChangeBaseClass):
         self.assert_qmp(result, 'return[0]/inserted/image/filename', new_img)
 
     def test_ro_rw_retain(self):
-        os.chmod(old_img, 0444)
+        os.chmod(old_img, 0o444)
         self.vm.add_drive(old_img, 'media=disk,read-only=on', 'floppy')
         self.vm.launch()
 
@@ -462,7 +462,7 @@  class TestChangeReadOnly(ChangeBaseClass):
         self.assert_qmp(result, 'return[0]/inserted/image/filename', new_img)
 
     def test_rw_ro_retain(self):
-        os.chmod(new_img, 0444)
+        os.chmod(new_img, 0o444)
         self.vm.add_drive(old_img, 'media=disk', 'floppy')
         self.vm.launch()
 
@@ -483,7 +483,7 @@  class TestChangeReadOnly(ChangeBaseClass):
         self.assert_qmp(result, 'return[0]/inserted/image/filename', old_img)
 
     def test_ro_rw(self):
-        os.chmod(old_img, 0444)
+        os.chmod(old_img, 0o444)
         self.vm.add_drive(old_img, 'media=disk,read-only=on', 'floppy')
         self.vm.launch()
 
@@ -503,7 +503,7 @@  class TestChangeReadOnly(ChangeBaseClass):
         self.assert_qmp(result, 'return[0]/inserted/image/filename', new_img)
 
     def test_rw_ro(self):
-        os.chmod(new_img, 0444)
+        os.chmod(new_img, 0o444)
         self.vm.add_drive(old_img, 'media=disk', 'floppy')
         self.vm.launch()
 
@@ -542,7 +542,7 @@  class TestChangeReadOnly(ChangeBaseClass):
         self.assert_qmp(result, 'return[0]/inserted/image/filename', new_img)
 
     def test_make_ro_rw(self):
-        os.chmod(new_img, 0444)
+        os.chmod(new_img, 0o444)
         self.vm.add_drive(old_img, 'media=disk', 'floppy')
         self.vm.launch()
 
@@ -562,7 +562,7 @@  class TestChangeReadOnly(ChangeBaseClass):
         self.assert_qmp(result, 'return[0]/inserted/image/filename', old_img)
 
     def test_make_rw_ro_by_retain(self):
-        os.chmod(old_img, 0444)
+        os.chmod(old_img, 0o444)
         self.vm.add_drive(old_img, 'media=disk,read-only=on', 'floppy')
         self.vm.launch()
 
@@ -581,7 +581,7 @@  class TestChangeReadOnly(ChangeBaseClass):
         self.assert_qmp(result, 'return[0]/inserted/image/filename', new_img)
 
     def test_make_ro_rw_by_retain(self):
-        os.chmod(new_img, 0444)
+        os.chmod(new_img, 0o444)
         self.vm.add_drive(old_img, 'media=disk', 'floppy')
         self.vm.launch()
 
@@ -600,7 +600,7 @@  class TestChangeReadOnly(ChangeBaseClass):
         self.assert_qmp(result, 'return[0]/inserted/image/filename', old_img)
 
     def test_rw_ro_cycle(self):
-        os.chmod(new_img, 0444)
+        os.chmod(new_img, 0o444)
         self.vm.add_drive(old_img, 'media=disk', 'floppy')
         self.vm.launch()

[4/9] iotests: use octal numbers for python3 compatibility

Commit Message

Comments

Patch