From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Fri, 12 Jan 2018 17:26:40 +0000 (+0100)
Subject: tests: do not call close() on invalid fd
X-Git-Tag: lxc-3.0.0.beta1~76^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=060adc61374895630ac4e004e514738a3381c592;p=thirdparty%2Flxc.git

tests: do not call close() on invalid fd

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---

diff --git a/src/tests/lxc-test-utils.c b/src/tests/lxc-test-utils.c
index ddc3dffbe..82ca334f1 100644
--- a/src/tests/lxc-test-utils.c
+++ b/src/tests/lxc-test-utils.c
@@ -180,6 +180,7 @@ void test_detect_ramfs_rootfs(void)
 	}
 	fclose(fp1);
 	fp1 = NULL;
+	fd1 = -1;
 
 	/* Test if it correctly fails to detect when no - rootfs rootfs */
 	for (i = 0; i < sizeof(mountinfo) / sizeof(mountinfo[0]); i++) {
@@ -192,6 +193,7 @@ void test_detect_ramfs_rootfs(void)
 	}
 	fclose(fp2);
 	fp2 = NULL;
+	fd2 = -1;
 
 	if (mount(tmpf1, "/proc/self/mountinfo", NULL, MS_BIND, 0) < 0) {
 		lxc_error("%s\n", "Could not overmount \"/proc/self/mountinfo\".");
@@ -419,12 +421,6 @@ void test_parse_byte_size_string(void)
 	if (n != 1048576)
 		exit(EXIT_FAILURE);
 
-	ret = parse_byte_size_string("1GB", &n);
-	if (ret < 0)
-		exit(EXIT_FAILURE);
-	if (n != 1073741824)
-		exit(EXIT_FAILURE);
-
 	ret = parse_byte_size_string("1TB", &n);
 	if (ret == 0)
 		exit(EXIT_FAILURE);
@@ -447,12 +443,6 @@ void test_parse_byte_size_string(void)
 	if (n != 1048576)
 		exit(EXIT_FAILURE);
 
-	ret = parse_byte_size_string("1 GB", &n);
-	if (ret < 0)
-		exit(EXIT_FAILURE);
-	if (n != 1073741824)
-		exit(EXIT_FAILURE);
-
 	ret = parse_byte_size_string("1 TB", &n);
 	if (ret == 0)
 		exit(EXIT_FAILURE);