New upstream version 8.1.0

storage/tests/TestConfig.cpp

@@ -0,0 +1,99 @@
+#include "TestConfig.h"
+
+TestConfig::TestConfig()
+{
+}
+
+TestConfig::~TestConfig()
+{
+}
+
+void TestConfig::SetUp()
+{
+   emptyConfigFile = DUMMY_EMPTY_CONFIG_FILE;
+   this->dummyConfigFile = DUMMY_NOEXIST_CONFIG_FILE;
+}
+
+void TestConfig::TearDown()
+{
+   // delete generated config file
+   if (StorageTk::pathExists(this->emptyConfigFile))
+   {
+      /* TODO : return value of remove is ignored now;
+       * maybe we should notify the user here (but that
+       * would break test output)
+       */
+      remove(this->emptyConfigFile.c_str());
+   }
+}
+
+TEST_F(TestConfig, missingConfigFile)
+{
+   // generate a bogus name for a config file
+   /* normally the default file should be nonexistant, but to be absolutely sure,
+    we check that and, in case, append a number */
+   int appendix = 0;
+   while (StorageTk::pathExists(this->dummyConfigFile))
+   {
+      appendix++;
+      this->dummyConfigFile = DUMMY_NOEXIST_CONFIG_FILE + StringTk::intToStr(appendix);
+   }
+
+   int argc = 2;
+   char* argv[2];
+
+   std::string appNameStr = APP_NAME;
+   appNameStr += '\0';
+
+   std::string cfgLineStr = "cfgFile=" + this->dummyConfigFile;
+   cfgLineStr += '\0';
+
+   argv[0] = &appNameStr[0];
+   argv[1] = &cfgLineStr[0];
+
+   // should throw InvalidConfigException now
+   ASSERT_THROW(Config config(argc, argv), InvalidConfigException);
+}
+
+TEST_F(TestConfig, defaultConfigFile)
+{
+   // get the path where the binary resides
+   int BUFSIZE = 255;
+   char exePathBuf[BUFSIZE];
+   // read only BUFSIZE-1, as we need to terminate the string manually later
+   ssize_t len = readlink("/proc/self/exe", exePathBuf, BUFSIZE-1);
+
+   /* In case of an error, failure will indicate the error */
+   if (len < 0)
+      FAIL() << "Internal error";
+
+   /* in case of insufficient buffer size, failure will indicate the error */
+   if (len >= BUFSIZE)
+      FAIL() << "Internal error";
+
+   // readlink does NOT null terminate the string, so we do it here to be safe
+   exePathBuf[len] = '\0';
+
+   // construct the path to the default config file
+   std::string defaultFileName = std::string(dirname(exePathBuf))
+      + "/" + DEFAULT_CONFIG_FILE_RELATIVE;
+
+   // create config with the default file and see what happens while parsing
+   int argc = 2;
+   char* argv[2];
+
+   std::string appNameStr = APP_NAME;
+   appNameStr += '\0';
+
+   std::string cfgLineStr = "cfgFile=" + defaultFileName;
+   cfgLineStr += '\0';
+
+   argv[0] = &appNameStr[0];
+   argv[1] = &cfgLineStr[0];
+
+   try {
+      Config config(argc, argv);
+   } catch (ConnAuthFileException& e) {
+      return;
+   }
+}

storage/tests/TestConfig.h

@@ -0,0 +1,30 @@
+#pragma once
+
+#include <app/config/Config.h>
+#include <common/app/log/LogContext.h>
+#include <gtest/gtest.h>
+#include <common/app/config/ConnAuthFileException.h>
+
+#include <libgen.h>
+
+#define DUMMY_NOEXIST_CONFIG_FILE      "/tmp/nonExistantConfigFile.conf.storage"
+#define DUMMY_EMPTY_CONFIG_FILE        "/tmp/emptyConfigFile.conf.storage"
+#define DEFAULT_CONFIG_FILE_RELATIVE   "dist/etc/beegfs-storage.conf"
+#define APP_NAME                       "beegfs-storage";
+
+class TestConfig: public ::testing::Test
+{
+   public:
+      TestConfig();
+      virtual ~TestConfig();
+
+      void SetUp() override;
+      void TearDown() override;
+
+   protected:
+      // we have these filenames as member variables because
+      // we might need to delete them in tearDown function
+      std::string dummyConfigFile;
+      std::string emptyConfigFile;
+};
+