3 files changed, 80 insertions, 4 deletions
diff --git a/source/script/tests/test_net_misc.sh b/source/script/tests/test_net_misc.sh
new file mode 100755
index 00000000000..3ceb0878851
--- /dev/null
+++ b/source/script/tests/test_net_misc.sh
@@ -0,0 +1,50 @@
+#!/bin/sh
+
+# various tests for the "net" command
+
+NET="$VALGRIND ${NET:-$BINDIR/net} $CONFIGURATION"
+
+NETTIME="${NET} time"
+NETLOOKUP="${NET} lookup"
+
+incdir=`dirname $0`
+. $incdir/test_functions.sh
+
+failed=0
+
+test_time()
+{
+	PARAM="$1"
+
+	${NETTIME} ${PARAM} -S localhost2
+}
+
+test_lookup()
+{
+	PARAM="$1"
+
+	${NETLOOKUP} ${PARAM}
+}
+
+testit "get the time" \
+	test_time || \
+	failed=`expr $failed + 1`
+
+testit "get the system time" \
+	test_time system || \
+	failed=`expr $failed + 1`
+
+testit "get the tize zone" \
+	test_time zone || \
+	failed=`expr $failed + 1`
+
+testit "lookup the PDC" \
+	test_lookup pdc || \
+	failed=`expr $failed + 1`
+
+testit "lookup the master browser" \
+	test_lookup master || \
+	failed=`expr $failed + 1`
+
+testok $0 $failed
+
diff --git a/source/script/tests/test_net_s3.sh b/source/script/tests/test_net_s3.sh
new file mode 100755
index 00000000000..24732580fae
--- /dev/null
+++ b/source/script/tests/test_net_s3.sh
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+# tests for the "net" command
+
+incdir=`dirname $0`
+. $incdir/test_functions.sh
+
+failed=0
+
+net_misc() {
+	echo "Running misc tests"
+	$SCRIPTDIR/test_net_misc.sh \
+	|| failed=`expr $failed + $?`
+}
+
+net_registry() {
+	echo "Running registry tests"
+	$SCRIPTDIR/test_net_registry.sh \
+	|| failed=`expr $failed + $?`
+}
+
+net_misc
+net_registry
+
+testok $0 $failed
+
diff --git a/source/script/tests/tests_all.sh b/source/script/tests/tests_all.sh
index 6e5334da315..cb545674e37 100755
--- a/source/script/tests/tests_all.sh
+++ b/source/script/tests/tests_all.sh
@@ -42,9 +42,9 @@ ntlm_auth_s3() {
 	|| failed=`expr $failed + $?`
 }
 
-net_registry() {
-	echo "RUNNING SUBTESTS net_registry"
-	$SCRIPTDIR/test_net_registry.sh \
+net_s3() {
+	echo "RUNNING SUBTESTS net_s3"
+	$SCRIPTDIR/test_net_s3.sh \
 	|| failed=`expr $failed + $?`
 }
 
@@ -72,7 +72,7 @@ if test "x$TESTS" = "x" ; then
 	smbclient_s3_encrypted
 	wbinfo_s3
 	ntlm_auth_s3
-	net_registry
+	net_s3
 	posix_s3
 else
 	for THIS_TEST in $TESTS; do