Changeset 981 for TI05-delivery
- Timestamp:
- 23/05/06 11:19:47 (15 years ago)
- Location:
- TI05-delivery/trunk
- Files:
-
- 4 added
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
TI05-delivery/trunk/src/bbftp-server-3.2.0/bbftpd/bbftpd_private_user.c
r973 r981 93 93 int bbftpd_private_auth(char *logmessage) 94 94 { 95 char msg[NDG_MESSAGE_LEN] , logmsg[NDG_MESSAGE_LEN+64];95 char msg[NDG_MESSAGE_LEN]; 96 96 /* Send version verification message. */ 97 97 if (bbftpd_private_recv(msg, NDG_MESSAGE_LEN, logmessage) == -1) { … … 99 99 } 100 100 else { 101 sprintf(logmsg, "Received auth message: %s", msg); 102 syslog(LOG_INFO, logmsg); 101 syslog(LOG_INFO, "Received auth message: %s", msg); 103 102 } 104 103 -
TI05-delivery/trunk/test/test_bbftpd.py
r979 r981 31 31 32 32 def testStartup(self): 33 """Start and stop the server. 34 """ 33 35 try: 34 36 self._startServer() 35 pid = self._getServerPid s()[0]37 pid = self._getServerPid() 36 38 self._stopServer(pid) 37 39 except Exception, e: … … 39 41 40 42 def testStartupWithSyslog(self): 43 """Start and stop the server, check syslog for INFO entries. 44 """ 41 45 try: 42 46 self._startServer() 43 pid = self._getServerPid s()[0]47 pid = self._getServerPid() 44 48 self._stopServer(pid) 45 49 46 50 lines = self._readSyslog() 47 self.assert_(len(lines) == 2)48 self.assert_(re.search('initialising private auth', lines[0]))49 self.assert_(re.search('finalising private auth', lines[1]))50 51 51 except Exception, e: 52 52 self.fail(e) 53 53 54 self.assert_(len(lines) == 2) 55 self.assert_(re.search('initialising private auth', lines[0])) 56 self.assert_(re.search('finalising private auth', lines[1])) 57 58 def testDir(self): 59 """Try connecting the client and listing a directory. 60 """ 61 62 self._startServer() 63 pid = self._getServerPid() 64 65 fh = self._runClient('-e "dir %s"' % self.DATADIR) 66 output = fh.read() 67 68 self._stopServer(pid) 69 70 self.assert_(self._findLines([r'dir .*/data', r' d .*/\.', r' d .*/\.\.', 71 r' f .*/foo', r' f .*/bar', r' f .*/baz'], output)) 72 54 73 55 74 #------------------------------------------------------------------------------ … … 58 77 """Find the server executable and any other important files. 59 78 """ 60 self.HOME = os. getenv('NDG_DELIVERY_HOME', os.curdir)79 self.HOME = os.path.abspath(os.getenv('NDG_DELIVERY_HOME', os.curdir)) 61 80 try: 62 81 self.BBFTPD = glob('%s/src/bbftp-server*/bbftpd/bbftpd' % self.HOME)[0] 63 82 except IndexError: 64 83 raise RuntimeError, 'Cannot find bbftpd executable' 84 try: 85 self.BBFTP = glob('%s/src/bbftp-client*/bbftpc/bbftp' % self.HOME)[0] 86 except: 87 raise RuntimeError, 'Cannot find bbftp executable' 88 dd = '%s/test/data' % self.HOME 89 if os.path.exists(dd): 90 self.DATADIR = dd 91 else: 92 raise RuntimeError, 'Cannot find test data directory' 65 93 66 94 def _startServer(self): … … 70 98 pids = os.popen('ps -C bbftpd -o %p --no-headers').readlines() 71 99 return [int(x.strip()) for x in pids] 100 101 def _getServerPid(self): 102 return self._getServerPids()[0] 72 103 73 104 def _stopServer(self, pid): … … 105 136 return filtered_log 106 137 138 def _runClient(self, *args): 139 """Run the client with th -m option and return a file handle of the output. 140 """ 141 fh = os.popen('%s -m -u testcase %s localhost' % (self.BBFTP, ' '.join(args))) 142 return fh 107 143 144 def _findLines(self, lines, string): 145 """Look for lines matching each regular expression in lines. 146 147 @return: True if all lines are found, else False 148 """ 149 150 for line in lines: 151 if not re.search('^%s$' % line, string, re.M): 152 return False 153 154 return True 108 155 109 156 if __name__ == '__main__':
Note: See TracChangeset
for help on using the changeset viewer.