[PATCH 5/9] s4: Create unit tests for python "samba.xattr" module

Matthieu Patou mat at matws.net
Mon Dec 7 09:13:00 MST 2009


---
 source4/scripting/python/pyxattr.c            |   12 +++++-
 source4/scripting/python/samba/tests/xattr.py |   49 +++++++++++++++++++++++++
 source4/selftest/tests.sh                     |    1 +
 3 files changed, 60 insertions(+), 2 deletions(-)
 create mode 100644 source4/scripting/python/samba/tests/xattr.py

diff --git a/source4/scripting/python/pyxattr.c b/source4/scripting/python/pyxattr.c
index 371334f..8f75a11 100644
--- a/source4/scripting/python/pyxattr.c
+++ b/source4/scripting/python/pyxattr.c
@@ -28,7 +28,14 @@
 #define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
 #endif
 
-
+static PyObject  *py_is_xattr_supported(PyObject *self)
+{
+#if !defined(HAVE_XATTR_SUPPORT)
+	return PyBool_FromLong(0);
+#else
+	return PyBool_FromLong(1);
+#endif
+}
 static PyObject *py_wrap_setxattr(PyObject *self, PyObject *args)
 {
 	char *filename, *attribute;
@@ -79,6 +86,8 @@ static PyMethodDef py_xattr_methods[] = {
 	{ "wrap_setxattr", (PyCFunction)py_wrap_setxattr, METH_VARARGS,
 		"wrap_setxattr(filename,attribute,value)\n"
 		"Set the given attribute to the given value on the given file." },
+	{ "is_xattr_supported", (PyCFunction)py_is_xattr_supported, METH_NOARGS,
+		"Return true if xattr are supported on this system\n"},
 	{ NULL }
 };
 
@@ -86,7 +95,6 @@ void initxattr(void)
 {
 	PyObject *m;
 
-	fprintf(stderr,"called ?\n");
 	m = Py_InitModule3("xattr", py_xattr_methods, 
 			   "Python bindings for xattr manipulation.");
 	if (m == NULL)
diff --git a/source4/scripting/python/samba/tests/xattr.py b/source4/scripting/python/samba/tests/xattr.py
new file mode 100644
index 0000000..c53fe41
--- /dev/null
+++ b/source4/scripting/python/samba/tests/xattr.py
@@ -0,0 +1,49 @@
+#!/usr/bin/python
+
+# Unix SMB/CIFS implementation. Tests for xattr manipulation
+# Copyright (C) Matthieu Patou <mat at matws.net> 2009
+#   
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#   
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#   
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+from samba.xattr import wrap_getxattr, wrap_setxattr, is_xattr_supported
+from samba.dcerpc import xattr
+from samba.ndr import ndr_pack, ndr_unpack
+from unittest import TestCase
+import random
+import os
+
+class XattrTests(TestCase):
+
+    def test_set_packeddata(self):
+		if is_xattr_supported():
+			random.seed()
+			tempf=os.path.join("/tmp","pytests"+str(int(100000*random.random())))
+			ntacl=xattr.NTACL()
+			ntacl.version = 1
+			open(tempf, 'w').write("empty")
+			wrap_setxattr(tempf,"user.unittests",ndr_pack(ntacl))
+			os.unlink(tempf)
+
+    def test_set_and_get(self):
+		if is_xattr_supported():
+			random.seed()
+			tempf=os.path.join("/tmp","pytests"+str(int(100000*random.random())))
+			reftxt="this is a test"
+			open(tempf, 'w').write("empty")
+			wrap_setxattr(tempf,"user.unittests",reftxt)
+			text = wrap_getxattr(tempf,"user.unittests")
+			self.assertEquals(text,reftxt)
+			os.unlink(tempf)
+        
diff --git a/source4/selftest/tests.sh b/source4/selftest/tests.sh
index 73209ef..408f4ec 100755
--- a/source4/selftest/tests.sh
+++ b/source4/selftest/tests.sh
@@ -463,6 +463,7 @@ plantest "ldap.python" dc PYTHONPATH="$PYTHONPATH:../lib/subunit/python" $PYTHON
 plantest "ldap.possibleInferiors.python" dc $PYTHON $samba4srcdir/dsdb/samdb/ldb_modules/tests/possibleinferiors.py $CONFIGURATION ldap://\$SERVER -U\$USERNAME%\$PASSWORD -W \$DOMAIN
 plantest "ldap.secdesc.python" dc PYTHONPATH="$PYTHONPATH:../lib/subunit/python" $PYTHON $samba4srcdir/lib/ldb/tests/python/sec_descriptor.py $CONFIGURATION \$SERVER -U\$USERNAME%\$PASSWORD -W \$DOMAIN
 plantest "ldap.acl.python" dc PYTHONPATH="$PYTHONPATH:../lib/subunit/python" $PYTHON $samba4srcdir/lib/ldb/tests/python/acl.py $CONFIGURATION \$SERVER -U\$USERNAME%\$PASSWORD -W \$DOMAIN
+plantest "xattr.python" none $SUBUNITRUN samba.tests.xattr
 plantest "blackbox.samba3dump" none $PYTHON $samba4srcdir/scripting/bin/samba3dump $samba4srcdir/../testdata/samba3
 rm -rf $PREFIX/upgrade
 plantest "blackbox.upgrade" none $PYTHON $samba4srcdir/setup/upgrade_from_s3 $CONFIGURATION --targetdir=$PREFIX/upgrade $samba4srcdir/../testdata/samba3 ../testdata/samba3/smb.conf
-- 
1.6.3.3


--------------040902060508090209080608
Content-Type: text/x-patch;
 name="0006-s4-regroup-gpo-modification-in-one-function-set-acl-.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename*0="0006-s4-regroup-gpo-modification-in-one-function-set-acl-.pa";
 filename*1="tch"



More information about the samba-technical mailing list