small fixes, improve tests

funbringer · funbringer · commit 3378f28064c7 · 2018-02-21T12:44:16.000+03:00
diff --git a/testgres/config.py b/testgres/config.py
@@ -98,7 +98,7 @@ def copy(self):
 TestgresConfig = testgres_config
 
 # stack of GlobalConfigs
-config_stack = [testgres_config]
+config_stack = []
 
 
 def rm_cached_initdb_dirs():
@@ -123,7 +123,7 @@ def pop_config():
     Set previous GlobalConfig options from stack.
     """
 
-    if len(config_stack) <= 1:
+    if len(config_stack) == 0:
         raise IndexError('Reached initial config')
 
     # restore popped config
@@ -141,9 +141,10 @@ def scoped_config(**options):
         ...         print(node.execute('select 1'))
     """
 
-    # set a new config with options
-    config = push_config(**options)
     try:
+        # set a new config with options
+        config = push_config(**options)
+
         # return it
         yield config
     finally:
diff --git a/tests/test_simple.py b/tests/test_simple.py
@@ -549,7 +549,16 @@ def test_config_stack(self):
             self.assertEqual(c1.cached_initdb_dir, d1)
 
             with scoped_config(cached_initdb_dir=d2) as c2:
+
+                stack_size = len(testgres.config.config_stack)
+
+                # try to break a stack
+                with self.assertRaises(TypeError):
+                    with scoped_config(dummy=True):
+                        pass
+
                 self.assertEqual(c2.cached_initdb_dir, d2)
+                self.assertEqual(len(testgres.config.config_stack), stack_size)
 
             self.assertEqual(c1.cached_initdb_dir, d1)
 
