Changeset 1336 for TI05-delivery/trunk

Timestamp:

27/07/06 12:15:29 (13 years ago)

Author:

spascoe

Message:

Test cases automatically dump client output to bbftpc.log.

This saves inserting debug code on demand.

File:

• TI05-delivery/trunk/test/test_embedded.py (modified) (11 diffs)

TI05-delivery/trunk/test/test_embedded.py

@@ -131 +131 @@
         # This is ugly but I need to redirect stderr to stdout
         fh = os.popen('sh -c "%s %s %s -u %s -r 1 -e \'%s\' localhost" 2>&1 ' % (BBFTP, f, p, user, cmd))
-        return fh
+
+        output = fh.read()
+        print >>open('./bbftpc.log', 'w'), output
+
+        return output
+
 
     def _clearLog(self, logfile="./bbftpd.log"):
@@ -176 +181 @@
         """
 
-
-        fh = self._runClient("dir %s" % DATADIR)
-        output = fh.read()
-
+        output = self._runClient("dir %s" % DATADIR)
 
         self.assertLines([r'dir .*/data', r' d .*/\.', r' d .*/\.\.',
@@ -194 +196 @@
         """
 
-        fh = self._runClient("dir .", debug=True)
-        output = fh.read()
+        output = self._runClient("dir .", debug=True)
 
         self.assertLines(['Received Auth handshake: NDG-Delivery-server %s' % VERSION], output)
@@ -207 +208 @@
         """
 
-        fh = self._runClient("dir .", privatestr="testPrivateStr")
-        output = fh.read()
+        output = self._runClient("dir .", privatestr="testPrivateStr")
 
         lines = self._readLog()
@@ -218 +218 @@
 
         tmp = tempfile.mktemp('test_bbftpd')
-        fh = self._runClient("get %s/foo %s" % (DATADIR, tmp))
+        output = self._runClient("get %s/foo %s" % (DATADIR, tmp))
 
         # Check the client output
-        output = fh.read()
-
         self.assertLines(['get.*nogzip'], output)
 
@@ -241 +239 @@
         dest = '%s/new_bar' % (DATADIR)
         os.system('cp %s %s' % (src, dest))
-        fh = self._runClient("put %s %s" % (src, dest))
+        output = self._runClient("put %s %s" % (src, dest))
 
         # Check the client output
-        output = fh.read()
         self.assertLines(['put .* nogzip'], output)
 
@@ -265 +262 @@
         """
 
-        fh = self._runClient("dir .", debug=True)
-        output = fh.read()
+        output = self._runClient("dir .", debug=True)
 
         lines = self._readLog()
@@ -288 +284 @@
         """
 
-        fh = self._runClient("stat %s/foo" % (DATADIR), debug=True)
-        output = fh.read()
+        output = self._runClient("stat %s/foo" % (DATADIR), debug=True)
 
         lines = self._readLog()
@@ -302 +297 @@
         """
 
-        fh = self._runClient("stat %s/bar" % (DATADIR), debug=True)
-        output = fh.read()
+        output = self._runClient("stat %s/bar" % (DATADIR), debug=True)
 
         lines = self._readLog()
@@ -320 +314 @@
         """Execute more than one command per connection.
         """
-        fh = self._runClient(["dir %s" % DATADIR, "stat %s/bar" % DATADIR])
-        output = fh.read()
+        output = self._runClient(["dir %s" % DATADIR, "stat %s/bar" % DATADIR])
 
         self.assertLines([r'dir .*/data', r' d .*/\.', r' d .*/\.\.',
@@ -361 +354 @@
 
         fh = os.popen('%s/test/runclient.py %s' % (HOME, ' '.join(args)))
-
-        return fh
+        output = fh.read()
+        print >>open('./bbftpc.log', 'w'), output
+
+        return output
 
 if __name__ == '__main__':