qemuimagetest: Remove connman test for lsb image and fix one warning in Test_Create_Qemu

There is no connman in LSB image. So we need to remove connman test from it.
And when we check if ip address fetched by Test_Fetch_Target_IP is valid,
we should use "==" operator for string comparison.

Signed-off-by Jiajun Xu <jiajun.xu@intel.com>

diff --git a/scripts/qemuimage-testlib b/scripts/qemuimage-testlib
index 713a47434d54526e3b2114c9d41bd36f5d812681..e2c2d244c56738c5798f9066db9027d294dac98a 100644 (file)
--- a/scripts/qemuimage-testlib
+++ b/scripts/qemuimage-testlib
@@ -420,7 +420,7 @@ Test_Create_Qemu()
                sleep 5
                TARGET_IPADDR=`Test_Fetch_Target_IP $PID`
                # If IP address is 0, means there is no qemu process found
-               if [ ${TARGET_IPADDR} -eq 0 ]; then
+               if [ ${TARGET_IPADDR} == "0" ]; then
                        Test_Info "There is no qemu process or qemu ip address found, return failed"
                        return $ret
                fi

diff --git a/scripts/qemuimage-tests/scenario/qemuarm/poky-image-lsb b/scripts/qemuimage-tests/scenario/qemuarm/poky-image-lsb
index 7b949a854c5665031c4e70a8cea954e8d81ec8d7..32d2bd144b39accacc3ed2f924346a1aabdf54d6 100644 (file)
--- a/scripts/qemuimage-tests/scenario/qemuarm/poky-image-lsb
+++ b/scripts/qemuimage-tests/scenario/qemuarm/poky-image-lsb
@@ -6,4 +6,3 @@ sanity shutdown
 sanity zypper_help
 sanity zypper_search
 sanity rpm_query
-sanity connman

diff --git a/scripts/qemuimage-tests/scenario/qemumips/poky-image-lsb b/scripts/qemuimage-tests/scenario/qemumips/poky-image-lsb
index 7b949a854c5665031c4e70a8cea954e8d81ec8d7..32d2bd144b39accacc3ed2f924346a1aabdf54d6 100644 (file)
--- a/scripts/qemuimage-tests/scenario/qemumips/poky-image-lsb
+++ b/scripts/qemuimage-tests/scenario/qemumips/poky-image-lsb
@@ -6,4 +6,3 @@ sanity shutdown
 sanity zypper_help
 sanity zypper_search
 sanity rpm_query
-sanity connman

diff --git a/scripts/qemuimage-tests/scenario/qemuppc/poky-image-lsb b/scripts/qemuimage-tests/scenario/qemuppc/poky-image-lsb
index 7b949a854c5665031c4e70a8cea954e8d81ec8d7..32d2bd144b39accacc3ed2f924346a1aabdf54d6 100644 (file)
--- a/scripts/qemuimage-tests/scenario/qemuppc/poky-image-lsb
+++ b/scripts/qemuimage-tests/scenario/qemuppc/poky-image-lsb
@@ -6,4 +6,3 @@ sanity shutdown
 sanity zypper_help
 sanity zypper_search
 sanity rpm_query
-sanity connman

diff --git a/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-lsb b/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-lsb
index 7b949a854c5665031c4e70a8cea954e8d81ec8d7..32d2bd144b39accacc3ed2f924346a1aabdf54d6 100644 (file)
--- a/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-lsb
+++ b/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-lsb
@@ -6,4 +6,3 @@ sanity shutdown
 sanity zypper_help
 sanity zypper_search
 sanity rpm_query
-sanity connman

diff --git a/scripts/qemuimage-tests/scenario/qemux86/poky-image-lsb b/scripts/qemuimage-tests/scenario/qemux86/poky-image-lsb
index 7b949a854c5665031c4e70a8cea954e8d81ec8d7..32d2bd144b39accacc3ed2f924346a1aabdf54d6 100644 (file)
--- a/scripts/qemuimage-tests/scenario/qemux86/poky-image-lsb
+++ b/scripts/qemuimage-tests/scenario/qemux86/poky-image-lsb
@@ -6,4 +6,3 @@ sanity shutdown
 sanity zypper_help
 sanity zypper_search
 sanity rpm_query
-sanity connman