From 07e953fa778b796f39b381b80e4c5726d22093cb Mon Sep 17 00:00:00 2001
From: Uwe Seimet <48174652+uweseimet@users.noreply.github.com>
Date: Tue, 28 Mar 2023 10:21:36 +0200
Subject: [PATCH] Fixed a potential issue with the unit test order (reserved
 file cleanup was missing) (#1137)

* Fixed a potential issue with the unit test order

* Updated error handling
---
 cpp/hal/gpiobus_raspberry.cpp  |  4 ++--
 cpp/test/piscsi_image_test.cpp | 10 ++++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/cpp/hal/gpiobus_raspberry.cpp b/cpp/hal/gpiobus_raspberry.cpp
index 757edc3b..c3dfe3ca 100644
--- a/cpp/hal/gpiobus_raspberry.cpp
+++ b/cpp/hal/gpiobus_raspberry.cpp
@@ -87,7 +87,7 @@ bool GPIOBUS_Raspberry::Init(mode_e mode)
     // Map peripheral region memory
     void *map = mmap(NULL, 0x1000100, PROT_READ | PROT_WRITE, MAP_SHARED, fd, baseaddr);
     if (map == MAP_FAILED) {
-        LOGERROR("Error: Unable to map memory")
+        LOGERROR("Error: Unable to map memory: %s", strerror(errno))
         close(fd);
         return false;
     }
@@ -985,4 +985,4 @@ uint32_t GPIOBUS_Raspberry::Acquire()
 #endif // SIGNAL_CONTROL_MODE
 
     return signals;
-}
\ No newline at end of file
+}
diff --git a/cpp/test/piscsi_image_test.cpp b/cpp/test/piscsi_image_test.cpp
index b4a12095..ac48aa2b 100644
--- a/cpp/test/piscsi_image_test.cpp
+++ b/cpp/test/piscsi_image_test.cpp
@@ -39,6 +39,8 @@ TEST(PiscsiImageTest, CreateImage)
 	PbCommand command;
 	PiscsiImage image;
 
+	StorageDevice::UnreserveAll();
+
 	EXPECT_FALSE(image.CreateImage(context, command)) << "Filename must be reported as missing";
 
 	SetParam(command, "file", "/a/b/c/filename");
@@ -63,6 +65,8 @@ TEST(PiscsiImageTest, DeleteImage)
 	PbCommand command;
 	PiscsiImage image;
 
+	StorageDevice::UnreserveAll();
+
 	EXPECT_FALSE(image.DeleteImage(context, command)) << "Filename must be reported as missing";
 
 	SetParam(command, "file", "/a/b/c/filename");
@@ -82,6 +86,8 @@ TEST(PiscsiImageTest, RenameImage)
 	PbCommand command;
 	PiscsiImage image;
 
+	StorageDevice::UnreserveAll();
+
 	EXPECT_FALSE(image.RenameImage(context, command)) << "Source filename must be reported as missing";
 
 	SetParam(command, "from", "/a/b/c/filename_from");
@@ -99,6 +105,8 @@ TEST(PiscsiImageTest, CopyImage)
 	PbCommand command;
 	PiscsiImage image;
 
+	StorageDevice::UnreserveAll();
+
 	EXPECT_FALSE(image.CopyImage(context, command)) << "Source filename must be reported as missing";
 
 	SetParam(command, "from", "/a/b/c/filename_from");
@@ -116,6 +124,8 @@ TEST(PiscsiImageTest, SetImagePermissions)
 	PbCommand command;
 	PiscsiImage image;
 
+	StorageDevice::UnreserveAll();
+
 	EXPECT_FALSE(image.SetImagePermissions(context, command)) << "Filename must be reported as missing";
 
 	SetParam(command, "file", "/a/b/c/filename");