[ProFTPD-committers] proftpd/tests/t/lib/ProFTPD/Tests/Modules mod_sql_sqlite.pm, 1.49, 1.50

[TJ S. <cas...@us...>]

Update of /cvsroot/proftp/proftpd/tests/t/lib/ProFTPD/Tests/Modules
In directory vz-cvs-3.sog:/tmp/cvs-serv17730/t/lib/ProFTPD/Tests/Modules

Modified Files:
	mod_sql_sqlite.pm 
Log Message:

Fix broken mod_sql_sqlite unit tests.


Index: mod_sql_sqlite.pm
===================================================================
RCS file: /cvsroot/proftp/proftpd/tests/t/lib/ProFTPD/Tests/Modules/mod_sql_sqlite.pm,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- mod_sql_sqlite.pm	23 Sep 2011 23:28:46 -0000	1.49
+++ mod_sql_sqlite.pm	24 Sep 2011 05:59:13 -0000	1.50
@@ -5205,6 +5205,7 @@
 
   my $user = 'proftpd';
   my $passwd = 'test';
+  my $group = 'ftpd';
   my $home_dir = File::Spec->rel2abs($tmpdir);
   my $uid = 500;
   my $gid = 500;
@@ -5226,7 +5227,7 @@
 
   auth_user_write($auth_user_file, $user, $passwd, $uid, $gid, $home_dir,
     '/bin/bash');
-  auth_group_write($auth_group_file, 'ftpd', $gid, $user);
+  auth_group_write($auth_group_file, $group, $gid, $user);
 
   my $db_file = File::Spec->rel2abs("$tmpdir/proftpd.db");
 
@@ -5278,7 +5279,6 @@
 
     AuthUserFile => $auth_user_file,
     AuthGroupFile => $auth_group_file,
-    DefaultRoot => '~',
 
     IfModules => {
       'mod_delay.c' => {
@@ -6446,10 +6446,10 @@
     chomp($row);
 
     # The default sqlite3 delimiter is '|'
-    $res = split(/\|/, $row);
+    $res = [split(/\|/, $row)];
   }
 
-  return $res;
+  return @$res;
 }
 
 sub sql_resolve_tag_bug3536 {
@@ -6559,7 +6559,7 @@
         SQLConnectInfo => $db_file,
         SQLLogFile => $log_file,
         SQLNamedQuery => 'command FREEFORM "INSERT INTO ftpsessions (user, ip_addr, command, request) VALUES (\'%u\', \'%L\', \'%m\', \'%r\')"',
-#        SQLLog => '* command',
+        SQLLog => '* command',
       },
     },
   };
@@ -6617,11 +6617,11 @@
   }
 
   my ($login, $ip_addr, $req);
-  ($login, $ip_addr, $cmd, $req) = get_cmds($db_file, "user = \'$user\'");
+  ($login, $ip_addr, $cmd, $req) = get_cmds($db_file, "user = \'$config_user\'");
 
   my $expected;
 
-  $expected = $user;
+  $expected = $config_user;
   $self->assert($expected eq $login,
     test_msg("Expected '$expected', got '$login'"));
 
@@ -8794,7 +8794,7 @@
 <IfModule mod_ifsession.c>
   <IfGroup regex .*>
     SQLLog EXIT logout
-  </IfUser>
+  </IfGroup>
 </IfModule>
 EOC
     unless (close($fh)) {