From 0ebc84ad6daafb5ceb73553e5c569d26274a41fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Aptel?= <aurelien.aptel@gmail.com>
Date: Wed, 24 Jul 2013 16:49:06 +0200
Subject: [PATCH] test_smbclient_tarmode.pl: add test for interactive session
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Aurélien Aptel <aurelien.aptel@gmail.com>
Reviewed-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Jim McDonough <jmcd@samba.org>
---
 .../script/tests/test_smbclient_tarmode.pl    | 49 +++++++++++--------
 1 file changed, 29 insertions(+), 20 deletions(-)

diff --git a/source3/script/tests/test_smbclient_tarmode.pl b/source3/script/tests/test_smbclient_tarmode.pl
index 5903125472f..ffe7c1e991b 100755
--- a/source3/script/tests/test_smbclient_tarmode.pl
+++ b/source3/script/tests/test_smbclient_tarmode.pl
@@ -23,26 +23,6 @@ C<test_smbclient_tarmode.pl> - Test for smbclient tar backup feature
 
 =cut
 
-# flags to test
-
-# c        DONE
-# c g      DONE
-# c a      DONE
-# c N      DONE
-# c I      DONE
-# c I r    DONE
-# c X      DONE
-# c X r    DONE
-# c F      DONE
-# c F r    DONE
-# x        DONE
-# x I      DONE
-# x I r    DONE
-# x X      DONE
-# x X r    DONE
-# x F      DONE
-# x F r    DONE
-
 use v5.14;
 use strict;
 use warnings;
@@ -101,6 +81,7 @@ my @TESTS = (
     ['create, include w/ filelist (F)',             \&test_creation_list],
     ['create, wildcard simple',                     \&test_creation_wildcard_simple],
     ['create, regex',                               \&test_creation_regex],
+    ['create, multiple backup in session',          \&test_creation_multiple],
     ['extract, normal files',                       \&test_extraction_normal],
     ['extract, explicit include',                   \&test_extraction_include],
     ['extract, explicit exclude',                   \&test_extraction_exclude],
@@ -613,6 +594,28 @@ sub test_helper {
     return 0;
 }
 
+sub test_creation_multiple {
+    my @exts = qw(jpg exe);
+    my @dirs = ('', "$DIR/");
+    my @all = make_env(\@exts, \@dirs);
+    my $nb;
+    my @inc;
+    my $err = 0;
+
+    my ($tarA, $tarB) = ("$TMP/a.tar", "$TMP/b.tar");
+    my @incA = grep { $_->remotepath =~ m{^[^/]+exe$} } @all;
+    my @incB = grep { $_->remotepath =~ m{^[^/]+jpg$} } @all;
+
+    my $flistA = File->new_local("$TMP/listA", file_list(@incA))->localpath;
+    my $flistB = File->new_local("$TMP/listB", file_list(@incB))->localpath;
+
+    smb_tar("tar cF $tarA $flistA ; tar cF $tarB $flistB ; quit");
+    $err += check_tar($tarA, \@incA);
+    $err += check_tar($tarB, \@incB);
+
+    $err;
+}
+
 sub test_extraction_regex {
     my @exts = qw(txt jpg exe);
     my @dirs = ('', "$DIR/", "$DIR/dir/");
@@ -985,6 +988,12 @@ sub check_tar {
 
     my %h;
 
+
+    if (!-f $tar) {
+        say "no tar file $tar";
+        return 1;
+    }
+
     for (@$files) {
         $h{$_->tarpath} = $_;
         $done{$_->tarpath} = 0;