From: Peter Krempa <pkrempa@redhat.com>
Date: Fri, 25 Apr 2014 19:44:06 +0000 (+0200)
Subject: test: storage: Initialize storage source to correct type
X-Git-Tag: v1.2.6-rc1~222
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=29aabe73feea86d43eb7e91218411a80a9367ef5;p=thirdparty%2Flibvirt.git

test: storage: Initialize storage source to correct type

Stat the path of the storage file being tested to set the correct type
into the virStorageSource. This will avoid breaking the test suite when
inquiring metadata of directory paths in the next patches.
---

diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c
index fb96c71d07..746bf63fc9 100644
--- a/tests/virstoragetest.c
+++ b/tests/virstoragetest.c
@@ -98,6 +98,7 @@ testStorageFileGetMetadata(const char *path,
                            uid_t uid, gid_t gid,
                            bool allow_probe)
 {
+    struct stat st;
     virStorageSourcePtr ret = NULL;
 
     if (VIR_ALLOC(ret) < 0)
@@ -106,6 +107,15 @@ testStorageFileGetMetadata(const char *path,
     ret->type = VIR_STORAGE_TYPE_FILE;
     ret->format = format;
 
+    if (stat(path, &st) == 0) {
+        if (S_ISDIR(st.st_mode)) {
+            ret->type = VIR_STORAGE_TYPE_DIR;
+            ret->format = VIR_STORAGE_FILE_DIR;
+        } else if (S_ISBLK(st.st_mode)) {
+            ret->type = VIR_STORAGE_TYPE_BLOCK;
+        }
+    }
+
     if (VIR_STRDUP(ret->relPath, path) < 0)
         goto error;