External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-11 12:25:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: Stop mocking canonicalize_file_name()

Browse Source 
We're using virFileCanonicalizePath() everywhere now, so
mocking this function has become entirely pointless.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Andrea Bolognani 2018-04-30 17:23:08 +02:00
parent 4267393198
commit 3bfe72e3dd
1 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tests/virpcimock.c
View File

@ -39,7 +39,6 @@ static int (*real_lstat)(const char *path, struct stat *sb);
static int (*real___lxstat)(int ver, const char *path, struct stat *sb);
static int (*real_stat)(const char *path, struct stat *sb);
static int (*real___xstat)(int ver, const char *path, struct stat *sb);
static char *(*real_canonicalize_file_name)(const char *path);
static int (*real_open)(const char *path, int flags, ...);
static int (*real_close)(int fd);
static DIR * (*real_opendir)(const char *name);
@ -811,7 +810,6 @@ init_syms(void)
VIR_MOCK_REAL_INIT(access);
VIR_MOCK_REAL_INIT_ALT(lstat, __lxstat);
VIR_MOCK_REAL_INIT_ALT(stat, __xstat);
VIR_MOCK_REAL_INIT(canonicalize_file_name);
VIR_MOCK_REAL_INIT(open);
VIR_MOCK_REAL_INIT(close);
VIR_MOCK_REAL_INIT(opendir);
@ -969,25 +967,6 @@ stat(const char *path, struct stat *sb)
return ret;
}
char *
canonicalize_file_name(const char *path)
{
char *ret;
init_syms();
if (STRPREFIX(path, SYSFS_PCI_PREFIX)) {
char *newpath;
if (getrealpath(&newpath, path) < 0)
return NULL;
ret = real_canonicalize_file_name(newpath);
VIR_FREE(newpath);
} else {
ret = real_canonicalize_file_name(path);
}
return ret;
}
int
open(const char *path, int flags, ...)
{