Merge lp:~patrick-crews/drizzle/bug786568 into lp:~drizzle-trunk/drizzle/development

[Patrick Crews]

Fixed a bug in dbqp where server settings could be borked by the use of an external data dir.

We now properly track such situations and mark then as needing a server reset for subsequent tests (to ensure the expected 'clean' state).

[lp:~patrick-crews/drizzle/bug786568]

2315. By Patrick Crews on 2011-05-25

Fix to unset reset switch post-reset

=== modified file 'tests/lib/server_mgmt/server.py'
--- tests/lib/server_mgmt/server.py	2011-03-24 00:44:40 +0000
+++ tests/lib/server_mgmt/server.py	2011-05-25 21:02:01 +0000
@@ -78,6 +78,7 @@
         self.failed_test = 0 # was the last test a failure?  our state is suspect
         self.server_start_timeout = 60 * self.valgrind_time_buffer
         self.pid = None
+        self.need_reset = False
 
     def initialize_databases(self):
         """ Call schemawriter to make db.opt files """
 
=== modified file 'tests/lib/server_mgmt/server_management.py'
--- tests/lib/server_mgmt/server_management.py	2011-04-22 22:41:58 +0000
+++ tests/lib/server_mgmt/server_management.py	2011-05-25 21:02:01 +0000
@@ -339,14 +339,19 @@
         datadir_requests = []
 
         for index,server in enumerate(current_servers):
-           
             desired_server_options = server_requirements[index]
             # We add in any user-supplied options here
             desired_server_options = desired_server_options + self.user_server_opts
 
+            # We handle a reset in case we need it:
+            if server.need_reset:
+                self.reset_server(server)
+                server.need_reset = False
+
             # Do our checking for config-specific madness we need to do
             if config_reader and config_reader.has_section(server.name):
                 # mark server for restart in case it hasn't yet
+                # this method is a bit hackish - need better method later
                 if '--restart' not in desired_server_options:
                     desired_server_options.append('--restart')
                 # We handle various scenarios
@@ -409,6 +414,9 @@
             source_dir_path = os.path.join(server.vardir,'std_data_ln',source_dir)
             self.system_manager.remove_dir(server.datadir)
             self.system_manager.copy_dir(source_dir_path, server.datadir)
+            # We need to signal that the server will need to be reset as we're
+            # using a non-standard datadir
+            server.need_reset = True
 
 
     def process_server_count(self, requester, desired_count, workdir, server_reqs):