Author: jelmer Date: 2007-09-01 19:16:22 +0000 (Sat, 01 Sep 2007) New Revision: 24866
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24866 Log: Put remainder of binding string tests in librpc/ directory. Removed: branches/SAMBA_4_0/source/selftest/test_binding_string.sh Modified: branches/SAMBA_4_0/ branches/SAMBA_4_0/source/librpc/tests/binding_string.c branches/SAMBA_4_0/source/selftest/test_ldap.sh branches/SAMBA_4_0/source/selftest/tests_all.sh Changeset: Property changes on: branches/SAMBA_4_0 ___________________________________________________________________ Name: bzr:revision-info ...skipped... Name: bzr:revision-id:v3-trunk0 ...skipped... Modified: branches/SAMBA_4_0/source/librpc/tests/binding_string.c =================================================================== --- branches/SAMBA_4_0/source/librpc/tests/binding_string.c 2007-09-01 18:35:57 UTC (rev 24865) +++ branches/SAMBA_4_0/source/librpc/tests/binding_string.c 2007-09-01 19:16:22 UTC (rev 24866) @@ -95,6 +95,41 @@ "ncacn_unix_stream:[/tmp/epmapper,sign]", }; +static bool test_parse_check_results(struct torture_context *tctx) +{ + struct dcerpc_binding *b; + struct GUID uuid; + + torture_assert_ntstatus_ok(tctx, + GUID_from_string("308FB580-1EB2-11CA-923B-08002B1075A7", &uuid), + "parsing uuid"); + + torture_assert_ntstatus_ok(tctx, dcerpc_parse_binding(tctx, "ncacn_np:$SERVER", &b), "parse"); + torture_assert(tctx, b->transport == NCACN_NP, "ncacn_np expected"); + torture_assert_ntstatus_ok(tctx, dcerpc_parse_binding(tctx, "ncacn_ip_tcp:$SERVER", &b), "parse"); + torture_assert(tctx, b->transport == NCACN_IP_TCP, "ncacn_ip_tcp expected"); + torture_assert_ntstatus_ok(tctx, dcerpc_parse_binding(tctx, "ncacn_np:$SERVER[rpcecho]", &b), "parse"); + torture_assert_str_equal(tctx, b->endpoint, "rpcecho", "endpoint"); + torture_assert_ntstatus_ok(tctx, dcerpc_parse_binding(tctx, "ncacn_np:$SERVER[/pipe/rpcecho]", &b), "parse"); + torture_assert_ntstatus_ok(tctx, dcerpc_parse_binding(tctx, "ncacn_np:$SERVER[/pipe/rpcecho,sign,seal]", &b), "parse"); + torture_assert(tctx, b->flags == DCERPC_SIGN+DCERPC_SEAL, "sign+seal flags"); + torture_assert_str_equal(tctx, b->endpoint, "/pipe/rpcecho", "endpoint"); + torture_assert_ntstatus_ok(tctx, dcerpc_parse_binding(tctx, "ncacn_np:$SERVER[,sign]", &b), "parse"); + torture_assert_ntstatus_ok(tctx, dcerpc_parse_binding(tctx, "ncacn_ip_tcp:$SERVER[,sign]", &b), "parse"); + torture_assert(tctx, b->endpoint == NULL, "endpoint"); + torture_assert(tctx, b->flags == DCERPC_SIGN, "sign flag"); + torture_assert_ntstatus_ok(tctx, dcerpc_parse_binding(tctx, "ncalrpc:", &b), "parse"); + torture_assert(tctx, b->transport == NCALRPC, "ncalrpc expected"); + torture_assert_ntstatus_ok(tctx, dcerpc_parse_binding(tctx, + "[EMAIL PROTECTED]:$SERVER", &b), "parse"); + torture_assert(tctx, GUID_equal(&b->object.uuid, &uuid), "object uuid"); + torture_assert_int_equal(tctx, b->object.if_version, 0, "object version"); + torture_assert_ntstatus_ok(tctx, dcerpc_parse_binding(tctx, + "[EMAIL PROTECTED]:$SERVER", &b), "parse"); + + return true; +} + static bool test_no_transport(struct torture_context *tctx) { const char *binding = "somehost"; @@ -129,5 +164,7 @@ torture_suite_add_simple_test(suite, "no transport", test_no_transport); + torture_suite_add_simple_test(suite, "parsing results", test_parse_check_results); + return suite; } Deleted: branches/SAMBA_4_0/source/selftest/test_binding_string.sh =================================================================== --- branches/SAMBA_4_0/source/selftest/test_binding_string.sh 2007-09-01 18:35:57 UTC (rev 24865) +++ branches/SAMBA_4_0/source/selftest/test_binding_string.sh 2007-09-01 19:16:22 UTC (rev 24866) @@ -1,18 +0,0 @@ -#!/bin/sh - -incdir=`dirname $0` -. $incdir/test_functions.sh - -for I in "ncacn_np:\$SERVER" \ - "ncacn_ip_tcp:\$SERVER" \ - "ncacn_np:\$SERVER[rpcecho]" \ - "ncacn_np:\$SERVER[/pipe/rpcecho]" \ - "ncacn_np:\$SERVER[/pipe/rpcecho,sign,seal]" \ - "ncacn_np:\$SERVER[,sign]" \ - "ncacn_ip_tcp:\$SERVER[,sign]" \ - "ncalrpc:" \ - "[EMAIL PROTECTED]:\$SERVER" \ - "[EMAIL PROTECTED]:\$SERVER" -do - plantest "$I" dc $samba4bindir/smbtorture $TORTURE_OPTIONS "$I" -U"\$USERNAME"%"\$PASSWORD" -W "\$DOMAIN" --option=torture:quick=yes RPC-ECHO "$*" -done Modified: branches/SAMBA_4_0/source/selftest/test_ldap.sh =================================================================== --- branches/SAMBA_4_0/source/selftest/test_ldap.sh 2007-09-01 18:35:57 UTC (rev 24865) +++ branches/SAMBA_4_0/source/selftest/test_ldap.sh 2007-09-01 19:16:22 UTC (rev 24866) @@ -4,15 +4,13 @@ incdir=`dirname $0` . $incdir/test_functions.sh -p=ldap for options in "" "--option=socket:testnonblock=true" "-U\$USERNAME%\$PASSWORD --option=socket:testnonblock=true" "-U\$USERNAME%\$PASSWORD"; do - plantest "TESTING PROTOCOL $p with options $options" dc $samba4srcdir/../testprogs/blackbox/test_ldb.sh $p \$SERVER_IP $options + plantest "TESTING PROTOCOL ldap with options $options" dc $samba4srcdir/../testprogs/blackbox/test_ldb.sh ldap \$SERVER_IP $options done # see if we support ldaps if grep ENABLE_GNUTLS.1 include/config.h > /dev/null; then - p=ldaps for options in "" "-U\$USERNAME%\$PASSWORD"; do - plantest "TESTING PROTOCOL $p with options $options" dc $samba4srcdir/../testprogs/blackbox/test_ldb.sh $p \$SERVER_IP $options + plantest "TESTING PROTOCOL ldaps with options $options" dc $samba4srcdir/../testprogs/blackbox/test_ldb.sh ldaps \$SERVER_IP $options done fi for t in LDAP-CLDAP LDAP-BASIC LDAP-SCHEMA LDAP-UPTODATEVECTOR Modified: branches/SAMBA_4_0/source/selftest/tests_all.sh =================================================================== --- branches/SAMBA_4_0/source/selftest/tests_all.sh 2007-09-01 18:35:57 UTC (rev 24865) +++ branches/SAMBA_4_0/source/selftest/tests_all.sh 2007-09-01 19:16:22 UTC (rev 24866) @@ -5,7 +5,6 @@ $SRCDIR/selftest/test_rpc.sh $SRCDIR/selftest/test_net.sh $SRCDIR/selftest/test_session_key.sh -$SRCDIR/selftest/test_binding_string.sh $SRCDIR/selftest/test_echo.sh $SRCDIR/selftest/test_posix.sh $SRCDIR/selftest/test_cifs.sh