← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to tests/lib/server_mgmt/server_management.py

  • Committer: Mark Atwood
  • Date: 2011-05-31 19:55:04 UTC
  • mfrom: (2313.2.2 innodb_bugfix)
  • Revision ID: me@mark.atwood.name-20110531195504-3j1uh09y83t9r72q
merge lp:~patrick-crews/drizzle/bug786568

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/lib/server_mgmt/server_management.py
339
339
        datadir_requests = []
340
340
 
341
341
        for index,server in enumerate(current_servers):
342
 
           
343
342
            desired_server_options = server_requirements[index]
344
343
            # We add in any user-supplied options here
345
344
            desired_server_options = desired_server_options + self.user_server_opts
346
345
 
 
346
            # We handle a reset in case we need it:
 
347
            if server.need_reset:
 
348
                self.reset_server(server)
 
349
                server.need_reset = False
 
350
 
347
351
            # Do our checking for config-specific madness we need to do
348
352
            if config_reader and config_reader.has_section(server.name):
349
353
                # mark server for restart in case it hasn't yet
 
354
                # this method is a bit hackish - need better method later
350
355
                if '--restart' not in desired_server_options:
351
356
                    desired_server_options.append('--restart')
352
357
                # We handle various scenarios
409
414
            source_dir_path = os.path.join(server.vardir,'std_data_ln',source_dir)
410
415
            self.system_manager.remove_dir(server.datadir)
411
416
            self.system_manager.copy_dir(source_dir_path, server.datadir)
 
417
            # We need to signal that the server will need to be reset as we're
 
418
            # using a non-standard datadir
 
419
            server.need_reset = True
412
420
 
413
421
 
414
422
    def process_server_count(self, requester, desired_count, workdir, server_reqs):