From 5a75fb194a290cb09fc03312262bd57196e86cb9 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Wed, 22 Sep 2010 12:52:29 -0700 Subject: ndrdump: Move blackbox test to standard python namespace. --- source4/scripting/python/samba/tests/__init__.py | 13 ++++++++++ .../python/samba/tests/blackbox/__init__.py | 0 .../python/samba/tests/blackbox/ndrdump.py | 28 ++++++++++++++++++++++ 3 files changed, 41 insertions(+) create mode 100644 source4/scripting/python/samba/tests/blackbox/__init__.py create mode 100755 source4/scripting/python/samba/tests/blackbox/ndrdump.py (limited to 'source4/scripting/python') diff --git a/source4/scripting/python/samba/tests/__init__.py b/source4/scripting/python/samba/tests/__init__.py index cee3397ba6..9644bad4cf 100644 --- a/source4/scripting/python/samba/tests/__init__.py +++ b/source4/scripting/python/samba/tests/__init__.py @@ -23,6 +23,7 @@ import os import ldb import samba from samba import param +import subprocess import tempfile # Other modules import these two classes from here, for convenience: @@ -128,3 +129,15 @@ class ValidNetbiosNameTests(TestCase): def test_invalid_characters(self): self.assertFalse(samba.valid_netbios_name("*BLA")) + + +class BlackboxTestCase(TestCase): + """Base test case for blackbox tests.""" + + def check_run(self, line): + bindir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../../../../bin")) + parts = line.split(" ") + if os.path.exists(os.path.join(bindir, parts[0])): + parts[0] = os.path.join(bindir, parts[0]) + line = " ".join(parts) + subprocess.check_call(line, shell=True) diff --git a/source4/scripting/python/samba/tests/blackbox/__init__.py b/source4/scripting/python/samba/tests/blackbox/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/source4/scripting/python/samba/tests/blackbox/ndrdump.py b/source4/scripting/python/samba/tests/blackbox/ndrdump.py new file mode 100755 index 0000000000..06c1b5c7d3 --- /dev/null +++ b/source4/scripting/python/samba/tests/blackbox/ndrdump.py @@ -0,0 +1,28 @@ +#!/usr/bin/python +# Blackbox tests for masktest +# Copyright (C) 2008 Andrew Tridgell +# Copyright (C) 2008 Andrew Bartlett +# based on test_smbclient.sh + +import os +from samba.tests import BlackboxTestCase + +data_path_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../../../../../librpc/tests")) + +class NdrDumpTests(BlackboxTestCase): + """Blackbox tests for ndrdump.""" + + def data_path(self, name): + return os.path.join(data_path_dir, name) + + def test_ndrdump_with_in(self): + self.check_run("ndrdump samr samr_CreateUser in %s" % (self.data_path("samr-CreateUser-in.dat"))) + + def test_ndrdump_with_out(self): + self.check_run("ndrdump samr samr_CreateUser out %s" % (self.data_path("samr-CreateUser-out.dat"))) + + def test_ndrdump_context_file(self): + self.check_run("ndrdump --context-file %s samr samr_CreateUser out %s" % (self.data_path("samr-CreateUser-in.dat"), self.data_path("samr-CreateUser-out.dat"))) + + def test_ndrdump_with_validate(self): + self.check_run("ndrdump --validate samr samr_CreateUser in %s" % (self.data_path("samr-CreateUser-in.dat"))) -- cgit