From f5d1db2c3e8122c7ead1cb8e8c71ca10eca9669c Mon Sep 17 00:00:00 2001 From: "sonja.mirtitsch%sun.com" Date: Wed, 5 Dec 2001 18:34:09 +0000 Subject: [PATCH] added 2 more tests git-svn-id: svn://10.0.0.236/trunk@109745 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/security/nss/tests/dbtests/dbtests.sh | 43 +++++++++++++------ 1 file changed, 31 insertions(+), 12 deletions(-) diff --git a/mozilla/security/nss/tests/dbtests/dbtests.sh b/mozilla/security/nss/tests/dbtests/dbtests.sh index 119a786fe96..e424b1fe306 100755 --- a/mozilla/security/nss/tests/dbtests/dbtests.sh +++ b/mozilla/security/nss/tests/dbtests/dbtests.sh @@ -123,9 +123,18 @@ dbtest_main() dbtest -r -d ./non_existant_dir ret=$? if [ $ret -ne 45 ]; then - html_failed " dbtest readonly succeeded in a nonexisting directory $ret" + html_failed " Dbtest readonly succeeded in a nonexisting directory $ret" else - html_passed " dbtest readonly failed in a nonexisting dir $ret" + html_passed " Dbtest readonly failed in a nonexisting dir $ret" + fi + + Echo "test force opening the database in a nonexisting directory" + dbtest -f -d ./non_existant_dir + ret=$? + if [ $ret -ne 0 ]; then + html_failed " Dbtest force failed in a nonexisting directory $ret" + else + html_passed " Dbtest force succeeded in a nonexisting dir $ret" fi Echo "test opening the database readonly in an empty directory" @@ -133,17 +142,18 @@ dbtest_main() tstclnt -h ${HOST} -d $EMPTY_DIR ret=$? if [ $ret -ne 1 ]; then - html_failed " tstclnt succeded in an empty directory $ret" + html_failed " Tstclnt succeded in an empty directory $ret" else - html_passed " tstclnt failed in an empty dir $ret" + html_passed " Tstclnt failed in an empty dir $ret" fi dbtest -r -d $EMPTY_DIR ret=$? if [ $ret -ne 45 ]; then - html_failed " dbtest readonly succeeded in an empty directory $ret" + html_failed " Dbtest readonly succeeded in an empty directory $ret" else - html_passed " dbtest readonly failed in an empty dir $ret" + html_passed " Dbtest readonly failed in an empty dir $ret" fi + rm -rf $EMPTY_DIR/* 2>/dev/null certutil -D -n xxxx -d $EMPTY_DIR #created DB ret=$? if [ $ret -ne 255 ]; then @@ -151,6 +161,15 @@ dbtest_main() else html_passed " Certutil failed in an empty dir $ret" fi + rm -rf $EMPTY_DIR/* 2>/dev/null + Echo "test force opening the database readonly in a empty directory" + dbtest -r -f -d $EMPTY_DIR + ret=$? + if [ $ret -ne 0 ]; then + html_failed " Dbtest force readonly failed in an empty directory $ret" + else + html_passed " Dbtest force readonly succeeded in an empty dir $ret" + fi Echo "test opening the database r/w in a readonly directory" mkdir $RONLY_DIR @@ -160,9 +179,9 @@ dbtest_main() dbtest -d $RONLY_DIR ret=$? if [ $ret -ne 45 ]; then - html_failed " dbtest r/w succeeded in an readonly directory $ret" + html_failed " Dbtest r/w succeeded in an readonly directory $ret" else - html_passed " dbtest r/w failed in an readonly dir $ret" + html_passed " Dbtest r/w failed in an readonly dir $ret" fi certutil -D -n "TestUser" -d . ret=$? @@ -177,18 +196,18 @@ dbtest_main() dbtest -d $RONLY_DIR -r ret=$? if [ $ret -ne 0 ]; then - html_failed " dbtest ronly failed in a readonly directory $ret" + html_failed " Dbtest readonly failed in a readonly directory $ret" else - html_passed " dbtest ronly succeeded in a readonly dir $ret" + html_passed " Dbtest readonly succeeded in a readonly dir $ret" fi Echo "test force opening the database r/w in a readonly directory" dbtest -d $RONLY_DIR -f ret=$? if [ $ret -ne 0 ]; then - html_failed " dbtest force failed in a readonly directory $ret" + html_failed " Dbtest force failed in a readonly directory $ret" else - html_passed " dbtest force succeeded in a readonly dir $ret" + html_passed " Dbtest force succeeded in a readonly dir $ret" fi Echo "ls -l $RONLY_DIR"