Fixed HAL test issues

- Regard TC as succeess even if USB media is not connected when MTP_init
- In case, when MTP feature is disabled, we ignore MTP_Init_p TC.

Change-Id: Ib1242e79f72ee2149c6e44814aa33f42d2d4ceff
Signed-off-by: saerome.kim <saerome.kim@samsung.com>

diff --git a/haltest/mtp-initiator-haltests.cpp b/haltest/mtp-initiator-haltests.cpp
index 34dae5cfd2ca37d0865a05c727aa7856e9c90f89..acac58c369a3aa93bd3f17a61450282c28e7bd6a 100644 (file)
--- a/haltest/mtp-initiator-haltests.cpp
+++ b/haltest/mtp-initiator-haltests.cpp
@@ -161,10 +161,16 @@ TEST(hal_libmtp, Init_p)
        if (ERROR_NONE == CheckFeature()) {
                LIBMTP_Init();
                rv = LIBMTP_Detect_Raw_Devices(&rawdevices, &numrawdevices);
+
+               /* We regard No USB media as success case */
+               if (LIBMTP_ERROR_NO_DEVICE_ATTACHED == rv ||
+                       LIBMTP_ERROR_CONNECTING == rv)
+                       rv = LIBMTP_ERROR_NONE;
        }
 
-       EXPECT_NE(LIBMTP_ERROR_NONE, rv) << "Initialization and Detected"
+       EXPECT_EQ(LIBMTP_ERROR_NONE, rv) << "Initialization and Detected"
                        " devices successfully";
+
        if (rawdevices) {
                free(rawdevices);
                rawdevices = NULL;

diff --git a/haltest/mtp-initiator-haltests.h b/haltest/mtp-initiator-haltests.h
index 8755f743bba049d6eaf26c48fc4ed68afdb40a5a..14c8b1956631d72db0dcbd6a54a628db85fdb5c6 100644 (file)
--- a/haltest/mtp-initiator-haltests.h
+++ b/haltest/mtp-initiator-haltests.h
@@ -22,7 +22,7 @@
 #ifdef USE_DLOG
 #include <dlog.h>
 #undef LOG_TAG
-#define LOG_TAG "WIFI_MESH_GTEST"
+#define LOG_TAG "MTP_INITIATOR_HALTEST"
 #define GLOGD(format, args...) LOGD(format, ##args)
 #else
 #define GLOGD(format, args...)