test-apt-cdrom: Fix for gnupg 2.1.15

[apt.git] / test / libapt / cdrom_test.cc

diff --git a/test/libapt/cdrom_test.cc b/test/libapt/cdrom_test.cc
index 7257eaf1b5aabb4179641ed949cda9f3f356346b..b4c51cdb0452ca52ae9438c1cc6a85caddaab9c1 100644 (file)
--- a/test/libapt/cdrom_test.cc
+++ b/test/libapt/cdrom_test.cc
@@ -91,7 +91,7 @@ TEST(CDROMTest,ReduceSourcelist)
 }
 TEST(CDROMTest, FindMountPointForDevice)
 {
 }
 TEST(CDROMTest, FindMountPointForDevice)
 {

-   char * tempfile = NULL;
+   std::string tempfile;

    FileFd fd;
    createTemporaryFile("mountpoints", fd, &tempfile,
         "rootfs / rootfs rw 0 0\n"
    FileFd fd;
    createTemporaryFile("mountpoints", fd, &tempfile,
         "rootfs / rootfs rw 0 0\n"


@@ -109,7 +109,6 @@ TEST(CDROMTest, FindMountPointForDevice)
    EXPECT_EQ("/boot/efi", FindMountPointForDevice("/dev/sda1"));
    EXPECT_EQ("/tmp", FindMountPointForDevice("tmpfs"));
 
    EXPECT_EQ("/boot/efi", FindMountPointForDevice("/dev/sda1"));
    EXPECT_EQ("/tmp", FindMountPointForDevice("tmpfs"));
 

-   if (tempfile !=  NULL)
-      unlink(tempfile);
-   free(tempfile);
+   if (tempfile.empty() == false)
+      unlink(tempfile.c_str());

 }
 }