diff options
Diffstat (limited to 'usr/src/test')
4 files changed, 55 insertions, 5 deletions
diff --git a/usr/src/test/smbsrv-tests/doc/README b/usr/src/test/smbsrv-tests/doc/README index e83affbb9b..2a6b667c5f 100644 --- a/usr/src/test/smbsrv-tests/doc/README +++ b/usr/src/test/smbsrv-tests/doc/README @@ -38,7 +38,51 @@ To install the full suite, run: -------------------------------------------------------------------------------- -2. Running the SMB Server Test Suite +2. Preparing the SMB Server Share + +When workgroup mode is used, make sure the pam_smb_passwd module is +configured in /etc/pam.conf or in /etc/pam.d: + +other password required pam_smb_passwd.so.1 nowarn + +Add test user: +# useradd test +# smbadm enable-user test +# passwd test + +If needed, add admin user as shown above, and add it to smb group: +# smbadm add-member -m admin@<hostname> administrators + +Set smb default settings: + +# sharectl set -p signing_required=false smb +# sharectl set -p signing_enabled=true smb +# svcadm restart network/smb/server + +Create dataset(s): + +Some smbtorture tests do rely on recordsize 4k. + +# zfs create -o recordsize=4k -o casesensitivity=mixed -o nbmand=on \ + <pool>/test + +Set permissions: + +# chmod A=everyone@:full_set:fd:allow /<path to mounpoint>/test + +Create required snapshots (WPTS needs exactly 3 snapshots): + +# zfs snapshot <pool>/test@a +# zfs snapshot <pool>/test@b +# zfs snapshot <pool>/test@c + +Activate smb share: + +# zfs set sharesmb=name=test <pool>/test + +-------------------------------------------------------------------------------- + +3. Running the SMB Server Test Suite The default configuration: /opt/smbsrv-tests/include/default.cfg @@ -68,7 +112,7 @@ as additional arguments to the individual test, eg -------------------------------------------------------------------------------- -3. Test Results +4. Test Results While the SMB Server Test Suite is running, one informational line is printed for each test, ending with one of: diff --git a/usr/src/test/test-runner/cmd/run b/usr/src/test/test-runner/cmd/run index 658940c3b9..189be04d4d 100644 --- a/usr/src/test/test-runner/cmd/run +++ b/usr/src/test/test-runner/cmd/run @@ -869,6 +869,7 @@ class TestRun(object): def summary(self): if Result.total == 0: + print('No tests to run') return print('\nResults Summary') diff --git a/usr/src/test/zfs-tests/cmd/scripts/zfstest.ksh b/usr/src/test/zfs-tests/cmd/scripts/zfstest.ksh index 40932e82a2..527c89163f 100644 --- a/usr/src/test/zfs-tests/cmd/scripts/zfstest.ksh +++ b/usr/src/test/zfs-tests/cmd/scripts/zfstest.ksh @@ -156,8 +156,13 @@ while getopts ac:l:qT: c; do auto_detect=true ;; 'c') - runfiles=$OPTARG - [[ -f $runfiles ]] || fail "Cannot read file: $runfiles" + runfile=$OPTARG + [[ -f $runfile ]] || fail "Cannot read file: $runfile" + if [[ -z $runfiles ]]; then + runfiles=$runfile + else + runfiles+=",$runfile" + fi ;; 'l') logfile=$OPTARG diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_010_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_010_pos.ksh index cd471999e0..cd364bb957 100644 --- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_010_pos.ksh +++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_010_pos.ksh @@ -220,7 +220,7 @@ fs=$TESTPOOL/$TESTFS1 log_must zfs create $fs log_must zfs snapshot $fs@snap while((i < 7)); do - log_must zfs clone $fs@snap $fs/$TESTCLONE$(python -c 'print "x" * 200').$i + log_must zfs clone $fs@snap $fs/$TESTCLONE$(printf %0.sx {1..200}).$i ((i=i+1)) ((j=j+200)) done |