Changeset 1336 for TI05-delivery/trunk
- Timestamp:
- 27/07/06 12:15:29 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
TI05-delivery/trunk/test/test_embedded.py
r1335 r1336 131 131 # This is ugly but I need to redirect stderr to stdout 132 132 fh = os.popen('sh -c "%s %s %s -u %s -r 1 -e \'%s\' localhost" 2>&1 ' % (BBFTP, f, p, user, cmd)) 133 return fh 133 134 output = fh.read() 135 print >>open('./bbftpc.log', 'w'), output 136 137 return output 138 134 139 135 140 def _clearLog(self, logfile="./bbftpd.log"): … … 176 181 """ 177 182 178 179 fh = self._runClient("dir %s" % DATADIR) 180 output = fh.read() 181 183 output = self._runClient("dir %s" % DATADIR) 182 184 183 185 self.assertLines([r'dir .*/data', r' d .*/\.', r' d .*/\.\.', … … 194 196 """ 195 197 196 fh = self._runClient("dir .", debug=True) 197 output = fh.read() 198 output = self._runClient("dir .", debug=True) 198 199 199 200 self.assertLines(['Received Auth handshake: NDG-Delivery-server %s' % VERSION], output) … … 207 208 """ 208 209 209 fh = self._runClient("dir .", privatestr="testPrivateStr") 210 output = fh.read() 210 output = self._runClient("dir .", privatestr="testPrivateStr") 211 211 212 212 lines = self._readLog() … … 218 218 219 219 tmp = tempfile.mktemp('test_bbftpd') 220 fh= self._runClient("get %s/foo %s" % (DATADIR, tmp))220 output = self._runClient("get %s/foo %s" % (DATADIR, tmp)) 221 221 222 222 # Check the client output 223 output = fh.read()224 225 223 self.assertLines(['get.*nogzip'], output) 226 224 … … 241 239 dest = '%s/new_bar' % (DATADIR) 242 240 os.system('cp %s %s' % (src, dest)) 243 fh= self._runClient("put %s %s" % (src, dest))241 output = self._runClient("put %s %s" % (src, dest)) 244 242 245 243 # Check the client output 246 output = fh.read()247 244 self.assertLines(['put .* nogzip'], output) 248 245 … … 265 262 """ 266 263 267 fh = self._runClient("dir .", debug=True) 268 output = fh.read() 264 output = self._runClient("dir .", debug=True) 269 265 270 266 lines = self._readLog() … … 288 284 """ 289 285 290 fh = self._runClient("stat %s/foo" % (DATADIR), debug=True) 291 output = fh.read() 286 output = self._runClient("stat %s/foo" % (DATADIR), debug=True) 292 287 293 288 lines = self._readLog() … … 302 297 """ 303 298 304 fh = self._runClient("stat %s/bar" % (DATADIR), debug=True) 305 output = fh.read() 299 output = self._runClient("stat %s/bar" % (DATADIR), debug=True) 306 300 307 301 lines = self._readLog() … … 320 314 """Execute more than one command per connection. 321 315 """ 322 fh = self._runClient(["dir %s" % DATADIR, "stat %s/bar" % DATADIR]) 323 output = fh.read() 316 output = self._runClient(["dir %s" % DATADIR, "stat %s/bar" % DATADIR]) 324 317 325 318 self.assertLines([r'dir .*/data', r' d .*/\.', r' d .*/\.\.', … … 361 354 362 355 fh = os.popen('%s/test/runclient.py %s' % (HOME, ' '.join(args))) 363 364 return fh 356 output = fh.read() 357 print >>open('./bbftpc.log', 'w'), output 358 359 return output 365 360 366 361 if __name__ == '__main__':
Note: See TracChangeset
for help on using the changeset viewer.