Changeset 997 for TI05-delivery/trunk

Timestamp:

24/05/06 10:57:52 (13 years ago)

Author:

spascoe

Message:

Added Retrieve and Send test cases.

Location:

TI05-delivery/trunk/test

Files:

• data/bar (modified) (1 diff)
• data/foo (modified) (1 diff)
• test_bbftpd.py (modified) (4 diffs)

TI05-delivery/trunk/test/data/bar

@@ +1 @@
+I t'aut I t'aur a puthy tat!

TI05-delivery/trunk/test/data/foo

@@ +1 @@
+the quick brown fox jumps over the lazy dog.
+

TI05-delivery/trunk/test/test_bbftpd.py

@@ -10 +10 @@
 import os, signal, time, syslog
 from glob import glob
-import re
+import re, tempfile
 
 class ExtendedAPITestCase(unittest.TestCase):
@@ -52 +52 @@
             self.fail(e)
 
-        self.assert_(len(lines) == 2)
-        self.assert_(re.search('initialising private auth', lines[0]))
-        self.assert_(re.search('finalising private auth', lines[1]))
+        self.assert_(self._findLines(['.*initialising private auth.*', '.*finalising private auth.*'], lines))
 
     def testDir(self):
@@ -71 +69 @@
                                       r' f .*/foo', r' f .*/bar', r' f .*/baz'], output))        
 
+        lines = self._readSyslog()
+        self.assert_(self._findLines(['.*Getting new bbftp connexion.*',
+                                      '.*Received auth message: NDG-bbFTP.*',
+                                      r'.*Authz: MSG_LIST_V2 .*/test/data/\*.*',
+                                      r'.*User  disconnected.*'], lines))
+        
+    def testRetr(self):
+        """Try retrieving a file.
+        """
+
+        self._startServer()
+        pid = self._getServerPid()
+
+        tmp = tempfile.mktemp('test_bbftpd')
+        fh = self._runClient('-e "get %s/foo %s"' % (self.DATADIR, tmp))
+
+        # Check the client output
+        output = fh.read()
+        self.assert_(self._findLines(['get.*nogzip'], output))
+
+        self._stopServer(pid)
+
+        # Check retrieved file
+        self.assert_(os.system('diff --brief %s/foo %s' % (self.DATADIR, tmp)) == 0)
+        os.remove(tmp)
+
+        # Check syslog
+        lines = self._readSyslog()
+        self.assert_(self._findLines(['.*Authz: RETR .*/foo', '.*GET .*/foo.*'], lines))
+
+    def testStore(self):
+        """Try storing a file.
+        """
+
+        self._startServer()
+        pid = self._getServerPid()
+
+        src = '%s/bar' % (self.DATADIR)
+        dest = '%s/new_bar' % (self.DATADIR)
+        os.system('cp %s %s' % (src, dest))
+        fh = self._runClient('-e "put %s %s"' % (src, dest))
+
+        # Check the client output
+        output = fh.read()
+        self.assert_(self._findLines(['put .* nogzip'], output))
+
+        self._stopServer(pid)
+
+        # Check sent file
+        self.assert_(os.system('diff --brief %s %s' % (dest, src)) == 0)
+        os.remove(dest)
+
+        # Check syslog
+        lines = self._readSyslog()
+        self.assert_(self._findLines(['.*Authz: STORE .*/new_bar', '.*PUT .*/new_bar.*'], lines))
 
     #------------------------------------------------------------------------------
@@ -134 +187 @@
                 filtered_log.append(line)
 
-        return filtered_log
+        return ''.join(filtered_log)
 
     def _runClient(self, *args):