catch errors in setup/teardown of test database

lonvia · lonvia · commit 60f8aab0d339 · 2019-11-16T10:44:09.000+01:00
Otherwise the tests are aborted with a runtime error which
looks like a programming error.
diff --git a/tests/common-pg.hpp b/tests/common-pg.hpp
@@ -150,27 +150,37 @@ class tempdb_t
 public:
     tempdb_t()
     {
-        conn_t conn("dbname=postgres");
-
-        m_db_name =
-            (boost::format("osm2pgsql-test-%1%-%2%") % getpid() % time(nullptr))
-                .str();
-        conn.exec(boost::format("DROP DATABASE IF EXISTS \"%1%\"") % m_db_name);
-        conn.exec(
-            boost::format("CREATE DATABASE \"%1%\" WITH ENCODING 'UTF8'") %
-            m_db_name);
+        try {
+            conn_t conn("dbname=postgres");
 
-        conn_t local = connect();
-        local.exec("CREATE EXTENSION postgis");
-        local.exec("CREATE EXTENSION hstore");
+            m_db_name =
+                (boost::format("osm2pgsql-test-%1%-%2%") % getpid() % time(nullptr))
+                    .str();
+            conn.exec(boost::format("DROP DATABASE IF EXISTS \"%1%\"") % m_db_name);
+            conn.exec(
+                boost::format("CREATE DATABASE \"%1%\" WITH ENCODING 'UTF8'") %
+                m_db_name);
+
+            conn_t local = connect();
+            local.exec("CREATE EXTENSION postgis");
+            local.exec("CREATE EXTENSION hstore");
+        } catch (std::runtime_error const &e) {
+            fprintf(stderr, "Test database cannot be created: %s\n", e.what());
+            fprintf(stderr, "Did you mean to run 'pg_virtualenv ctest'?\n");
+            exit(1);
+        }
     }
 
     ~tempdb_t() noexcept
     {
         if (!m_db_name.empty()) {
-            conn_t conn("dbname=postgres");
-            conn.query(boost::format("DROP DATABASE IF EXISTS \"%1%\"") %
-                       m_db_name);
+            try {
+                conn_t conn("dbname=postgres");
+                conn.query(boost::format("DROP DATABASE IF EXISTS \"%1%\"") %
+                           m_db_name);
+            } catch (...) {
+                fprintf(stderr, "DROP DATABASE failed. Ignored.\n");
+            }
         }
     }
 
