Patchwork qemu-iotests: fix qmp.py search path

login
register
mail settings
Submitter Fam Zheng
Date Sept. 26, 2013, 11:57 a.m.
Message ID <1380196654-22446-1-git-send-email-famz@redhat.com>
Download mbox | patch
Permalink /patch/278185/
State New
Headers show

Comments

Fam Zheng - Sept. 26, 2013, 11:57 a.m.
QMP/qmp.py is renamed to scripts/qmp/qmp.py, fix the search path in iotests.py.

Signed-off-by: Fam Zheng <famz@redhat.com>
---
 tests/qemu-iotests/iotests.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Luiz Capitulino - Sept. 26, 2013, 12:53 p.m.
On Thu, 26 Sep 2013 19:57:34 +0800
Fam Zheng <famz@redhat.com> wrote:

> QMP/qmp.py is renamed to scripts/qmp/qmp.py, fix the search path in iotests.py.

OOPs, sorry for that.

> 
> Signed-off-by: Fam Zheng <famz@redhat.com>
> ---
>  tests/qemu-iotests/iotests.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
> index 87b4a3a..376d6e8 100644
> --- a/tests/qemu-iotests/iotests.py
> +++ b/tests/qemu-iotests/iotests.py
> @@ -21,7 +21,7 @@ import re
>  import subprocess
>  import string
>  import unittest
> -import sys; sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', 'QMP'))
> +import sys; sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', 'scripts', 'qmp'))
>  import qmp
>  import struct
>
Kevin Wolf - Sept. 26, 2013, 2:04 p.m.
Am 26.09.2013 um 13:57 hat Fam Zheng geschrieben:
> QMP/qmp.py is renamed to scripts/qmp/qmp.py, fix the search path in iotests.py.
> 
> Signed-off-by: Fam Zheng <famz@redhat.com>

Thanks, applied to the block branch.

Kevin

Patch

diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index 87b4a3a..376d6e8 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -21,7 +21,7 @@  import re
 import subprocess
 import string
 import unittest
-import sys; sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', 'QMP'))
+import sys; sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', 'scripts', 'qmp'))
 import qmp
 import struct