diff options
| author | Günther Deschner <gd@samba.org> | 2010-06-02 15:35:33 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2010-06-02 15:37:50 +0200 |
| commit | 3854f0708e8c7a2e37310cd24d8acd52d87b9d6b (patch) | |
| tree | b520ee6fdff46953ecdfe1a7892154551889711c | |
| parent | 57ab910b6f3a24bf188415baf58de610203594b1 (diff) | |
| download | samba-3854f0708e8c7a2e37310cd24d8acd52d87b9d6b.tar.gz samba-3854f0708e8c7a2e37310cd24d8acd52d87b9d6b.tar.bz2 samba-3854f0708e8c7a2e37310cd24d8acd52d87b9d6b.zip | |
s3-selftest: Fix blackbox smbclient s3 tests during make selftest.
Guenther
| -rwxr-xr-x | selftest/selftest.pl | 4 | ||||
| -rw-r--r-- | selftest/target/Samba3.pm | 2 | ||||
| -rw-r--r-- | source3/script/tests/tests_smbclient_s3.sh | 2 | ||||
| -rwxr-xr-x | source3/selftest/tests.sh | 12 |
4 files changed, 12 insertions, 8 deletions
diff --git a/selftest/selftest.pl b/selftest/selftest.pl index aa3d79c5d7..6ec429b6ce 100755 --- a/selftest/selftest.pl +++ b/selftest/selftest.pl @@ -787,6 +787,7 @@ my @exported_envvars = ( # user stuff "USERNAME", + "USERID", "PASSWORD", "DC_USERNAME", "DC_PASSWORD", @@ -794,7 +795,8 @@ my @exported_envvars = ( # misc stuff "KRB5_CONFIG", "WINBINDD_SOCKET_DIR", - "WINBINDD_PRIV_PIPE_DIR" + "WINBINDD_PRIV_PIPE_DIR", + "LOCAL_PATH" ); $SIG{INT} = $SIG{QUIT} = $SIG{TERM} = sub { diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm index de87311ad2..02dbbe0dc1 100644 --- a/selftest/target/Samba3.pm +++ b/selftest/target/Samba3.pm @@ -677,6 +677,7 @@ $unix_name-group:x:$unix_gids[0]: $ret{CONFIGURATION} ="-s $conffile"; $ret{SERVER} = $server; $ret{USERNAME} = $unix_name; + $ret{USERID} = $unix_uid; $ret{DOMAIN} = $domain; $ret{NETBIOSNAME} = $server; $ret{PASSWORD} = $password; @@ -687,6 +688,7 @@ $unix_name-group:x:$unix_gids[0]: $ret{NSS_WRAPPER_PASSWD} = $nss_wrapper_passwd; $ret{NSS_WRAPPER_GROUP} = $nss_wrapper_group; $ret{NSS_WRAPPER_WINBIND_SO_PATH} = $ENV{NSS_WRAPPER_WINBIND_SO_PATH}; + $ret{LOCAL_PATH} = "$shrdir"; return \%ret; } diff --git a/source3/script/tests/tests_smbclient_s3.sh b/source3/script/tests/tests_smbclient_s3.sh index 40edf2296f..5dbcd436f5 100644 --- a/source3/script/tests/tests_smbclient_s3.sh +++ b/source3/script/tests/tests_smbclient_s3.sh @@ -1 +1 @@ -. $SCRIPTDIR/test_smbclient_s3.sh $SERVER $SERVER_IP $USERNAME $PASSWORD +. $SCRIPTDIR/test_smbclient_s3.sh $SERVER $SERVER_IP $USERNAME $PASSWORD $USERID $LOCAL_PATH diff --git a/source3/selftest/tests.sh b/source3/selftest/tests.sh index 4c96c3b2ce..7bd76390e3 100755 --- a/source3/selftest/tests.sh +++ b/source3/selftest/tests.sh @@ -131,16 +131,16 @@ export PASSWORD ) # plain -plantest "blackbox.smbclient_s3.plain" dc BINDIR="$BINDIR" script/tests/test_smbclient_s3.sh \$SERVER \$SERVER_IP \$USERNAME \$PASSWORD -plantest "blackbox.smbclient_s3.plain member creds" member BINDIR="$BINDIR" script/tests/test_smbclient_s3.sh \$SERVER \$SERVER_IP \$SERVER\\\\\$USERNAME \$PASSWORD -plantest "blackbox.smbclient_s3.plain domain creds" member BINDIR="$BINDIR" script/tests/test_smbclient_s3.sh \$SERVER \$SERVER_IP \$DOMAIN\\\\\$DC_USERNAME \$DC_PASSWORD +plantest "blackbox.smbclient_s3.plain" dc BINDIR="$BINDIR" script/tests/test_smbclient_s3.sh \$SERVER \$SERVER_IP \$USERNAME \$PASSWORD \$USERID \$LOCAL_PATH +plantest "blackbox.smbclient_s3.plain member creds" member BINDIR="$BINDIR" script/tests/test_smbclient_s3.sh \$SERVER \$SERVER_IP \$SERVER\\\\\$USERNAME \$PASSWORD \$USERID \$LOCAL_PATH +plantest "blackbox.smbclient_s3.plain domain creds" member BINDIR="$BINDIR" script/tests/test_smbclient_s3.sh \$SERVER \$SERVER_IP \$DOMAIN\\\\\$DC_USERNAME \$DC_PASSWORD \$USERID \$LOCAL_PATH # sign, only the member server allows signing -plantest "blackbox.smbclient_s3.sign member creds" member BINDIR="$BINDIR" script/tests/test_smbclient_s3.sh \$SERVER \$SERVER_IP \$SERVER\\\\\$USERNAME \$PASSWORD "--signing=required" -plantest "blackbox.smbclient_s3.sign domain creds" member BINDIR="$BINDIR" script/tests/test_smbclient_s3.sh \$SERVER \$SERVER_IP \$DOMAIN\\\\\$DC_USERNAME \$DC_PASSWORD "--signing=required" +plantest "blackbox.smbclient_s3.sign member creds" member BINDIR="$BINDIR" script/tests/test_smbclient_s3.sh \$SERVER \$SERVER_IP \$SERVER\\\\\$USERNAME \$PASSWORD \$USERID \$LOCAL_PATH "--signing=required" +plantest "blackbox.smbclient_s3.sign domain creds" member BINDIR="$BINDIR" script/tests/test_smbclient_s3.sh \$SERVER \$SERVER_IP \$DOMAIN\\\\\$DC_USERNAME \$DC_PASSWORD \$USERID \$LOCAL_PATH "--signing=required" # encrypted -plantest "blackbox.smbclient_s3.crypt" dc BINDIR="$BINDIR" script/tests/test_smbclient_s3.sh \$SERVER \$SERVER_IP \$USERNAME \$PASSWORD "-e" +plantest "blackbox.smbclient_s3.crypt" dc BINDIR="$BINDIR" script/tests/test_smbclient_s3.sh \$SERVER \$SERVER_IP \$USERNAME \$PASSWORD \$USERID \$LOCAL_PATH "-e" # these don't work yet #plantest "blackbox.smbclient_s3.crypt member creds" member BINDIR="$BINDIR" script/tests/test_smbclient_s3.sh \$SERVER \$SERVER_IP \$SERVER\\\\\$USERNAME \$PASSWORD "-e" |