← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to tests/lib/dbqp_modes/dtr/dtr_test_execution.py

  • Committer: patrick crews
  • Date: 2011-10-05 20:40:33 UTC
  • mfrom: (2337.1.24 dbqp_revamp2)
  • mto: This revision was merged to the branch mainline in revision 2435.
  • Revision ID: gleebix@gmail.com-20111005204033-5m6kvcii1q87yur6
Merge with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/lib/dbqp_modes/dtr/dtr_test_execution.py
89
89
            # We want to record a new result
90
90
            drizzletest_arguments.append('--record')
91
91
        drizzletest_cmd = "%s %s %s" %( self.cmd_prefix
92
 
                                      , self.system_manager.code_tree.drizzletest
 
92
                                      , self.master_server.code_tree.drizzletest
93
93
                                      , " ".join(drizzletest_arguments))
94
94
        return drizzletest_cmd
95
95
 
120
120
        output = ''.join(drizzletest_file.readlines())
121
121
        drizzletest_file.close()
122
122
 
123
 
        if self.debug:
124
 
            self.logging.debug("drizzletest_retcode: %d" %(retcode))
 
123
        self.logging.debug("drizzletest_retcode: %d" %(retcode))
125
124
        self.current_test_retcode = retcode
126
125
        self.current_test_output = output
127
126
        self.current_test_exec_time = execution_time
138
137
        else:
139
138
            return 'fail'
140
139
 
141
 
    def handle_system_reqs(self):
142
 
        """ We check our test case and see what we need to do
143
 
            system-wise to get ready.  This is likely to be 
144
 
            mode-dependent and this is just a placeholder
145
 
            method
146
 
 
147
 
        """
148
 
 
149
 
        self.process_environment_reqs()
150
 
        self.process_symlink_reqs()
151
 
        self.process_master_sh()  
152
 
        return
153
 
 
154
 
    def process_master_sh(self):
155
 
        """ We do what we need to if we have a master.sh file """
156
 
        if self.current_testcase.master_sh:
157
 
            retcode, output = self.system_manager.execute_cmd("/bin/sh %s" %(self.current_testcase.master_sh))
158
 
            if self.debug:
159
 
                self.logging.info("retcode: %retcode")
160
 
                self.logging.info("%output")
161
 
 
162
 
    def process_environment_reqs(self):
163
 
        """ We generate the ENV vars we need set
164
 
            and then ask systemManager to do so
165
 
 
166
 
        """
167
 
        env_reqs = { 'DRIZZLETEST_VARDIR': self.master_server.vardir
168
 
                   ,  'DRIZZLE_TMP_DIR': self.master_server.tmpdir
169
 
                   ,  'MASTER_MYSOCK': self.master_server.socket_file
170
 
                   ,  'MASTER_MYPORT': str(self.master_server.master_port)
171
 
                   ,  'MC_PORT': str(self.master_server.mc_port)
172
 
                   ,  'PBMS_PORT': str(self.master_server.pbms_port)
173
 
                   ,  'JSON_SERVER_PORT': str(self.master_server.json_server_port)
174
 
                   ,  'RABBITMQ_NODE_PORT': str(self.master_server.rabbitmq_node_port)
175
 
                   ,  'DRIZZLE_TCP_PORT': str(self.master_server.drizzle_tcp_port)
176
 
                   ,  'EXE_DRIZZLE': self.master_server.drizzle_client
177
 
                   ,  'MASTER_SERVER_SLAVE_CONFIG' : self.master_server.slave_config_file
178
 
                   ,  'DRIZZLE_DUMP': "%s --no-defaults -uroot -p%d" %( self.master_server.drizzledump
179
 
                                                        , self.master_server.master_port)
180
 
                   ,  'DRIZZLE_SLAP': "%s -uroot -p%d" %( self.master_server.drizzleslap
181
 
                                                        , self.master_server.master_port)
182
 
                   ,  'DRIZZLE_IMPORT': "%s -uroot -p%d" %( self.master_server.drizzleimport
183
 
                                                          , self.master_server.master_port)
184
 
                   ,  'DRIZZLE': "%s -uroot -p%d" %( self.master_server.drizzle_client
185
 
                                                   , self.master_server.master_port)
186
 
                   ,  'DRIZZLE_TRX_READER' : self.system_manager.code_tree.drizzle_trx_reader
187
 
                   }     
188
 
 
189
 
        self.working_environment = self.system_manager.create_working_environment(env_reqs)
190
 
 
191
 
    def process_symlink_reqs(self):
192
 
        """ Create any symlinks we may need """
193
 
        needed_symlinks = []
194
 
 
195
 
        self.system_manager.create_symlinks(needed_symlinks)
196
 
 
197
 
    
198
 
   
199
 
 
200