From 035dbce3adcbf36afee5e9cc59912c4f07fe0f5e Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 18 May 2011 10:34:03 +1000 Subject: s3-selftest Remove unused sambalib.py from comfychair test system The test binary t_snprintf has moved to lib/replace --- source3/stf/sambalib.py | 39 --------------------------------------- 1 file changed, 39 deletions(-) delete mode 100644 source3/stf/sambalib.py (limited to 'source3/stf') diff --git a/source3/stf/sambalib.py b/source3/stf/sambalib.py deleted file mode 100644 index 552280ed29..0000000000 --- a/source3/stf/sambalib.py +++ /dev/null @@ -1,39 +0,0 @@ -#! /usr/bin/python - -# Comfychair test cases for Samba string functions. - -# Copyright (C) 2003 by Martin Pool -# -# 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 . - -"""Tests for Samba library functions.""" - -import sys, re, comfychair -from unicodenames import * - -class snprintf_Test(comfychair.TestCase): - def runtest(self): - # Everything is built in to the test - out, err = self.runcmd('t_snprintf') - -# Define the tests exported by this module -tests = [snprintf_Test] - -# Handle execution of this file as a main program -if __name__ == '__main__': - comfychair.main(tests) - -# Local variables: -# coding: utf-8 -# End: -- cgit From fa3e2fc8bb3e935c65b7043382cad1d649cb68a6 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 18 May 2011 12:06:25 +1000 Subject: selftest: Re-enable strings.py from source3/stf as a python subunit test --- source3/stf/strings.py | 149 -------------------------------------------- source3/stf/unicodenames.py | 31 --------- 2 files changed, 180 deletions(-) delete mode 100755 source3/stf/strings.py delete mode 100644 source3/stf/unicodenames.py (limited to 'source3/stf') diff --git a/source3/stf/strings.py b/source3/stf/strings.py deleted file mode 100755 index 4e00021525..0000000000 --- a/source3/stf/strings.py +++ /dev/null @@ -1,149 +0,0 @@ -#! /usr/bin/python - -# Comfychair test cases for Samba string functions. - -# Copyright (C) 2003 by Martin Pool -# -# 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 . - -# XXX: All this code assumes that the Unix character set is UTF-8, -# which is the most common setting. I guess it would be better to -# force it to that value while running the tests. I'm not sure of the -# best way to do that yet. -# -# Note that this is NOT the case in C code until the loadparm table is -# intialized -- the default seems to be ASCII, which rather lets Samba -# off the hook. :-) The best way seems to be to put this in the test -# harnesses: -# -# lp_load("/dev/null", True, False, False); -# -# -- mbp - -import sys, re, comfychair -from unicodenames import * - -def signum(a): - if a < 0: - return -1 - elif a > 0: - return +1 - else: - return 0 - - -class PushUCS2_Tests(comfychair.TestCase): - """Conversion to/from UCS2""" - def runtest(self): - OE = LATIN_CAPITAL_LETTER_O_WITH_DIARESIS - oe = LATIN_CAPITAL_LETTER_O_WITH_DIARESIS - cases = ['hello', - 'hello world', - 'g' + OE + OE + 'gomobile', - 'g' + OE + oe + 'gomobile', - u'foo\u0100', - KATAKANA_LETTER_A * 20, - ] - for u8str in cases: - out, err = self.runcmd("t_push_ucs2 \"%s\"" % u8str.encode('utf-8')) - self.assert_equal(out, "0\n") - - -class StrCaseCmp(comfychair.TestCase): - """String comparisons in simple ASCII""" - def run_strcmp(self, a, b, expect): - out, err = self.runcmd('t_strcmp \"%s\" \"%s\"' % (a.encode('utf-8'), b.encode('utf-8'))) - if signum(int(out)) != expect: - self.fail("comparison failed:\n" - " a=%s\n" - " b=%s\n" - " expected=%s\n" - " result=%s\n" % (`a`, `b`, `expect`, `out`)) - - def runtest(self): - # A, B, strcasecmp(A, B) - cases = [('hello', 'hello', 0), - ('hello', 'goodbye', +1), - ('goodbye', 'hello', -1), - ('hell', 'hello', -1), - ('', '', 0), - ('a', '', +1), - ('', 'a', -1), - ('a', 'A', 0), - ('aa', 'aA', 0), - ('Aa', 'aa', 0), - ('longstring ' * 100, 'longstring ' * 100, 0), - ('longstring ' * 100, 'longstring ' * 100 + 'a', -1), - ('longstring ' * 100 + 'a', 'longstring ' * 100, +1), - (KATAKANA_LETTER_A, KATAKANA_LETTER_A, 0), - (KATAKANA_LETTER_A, 'a', 1), - ] - for a, b, expect in cases: - self.run_strcmp(a, b, expect) - -class strstr_m(comfychair.TestCase): - """String comparisons in simple ASCII""" - def run_strstr(self, a, b, expect): - out, err = self.runcmd('t_strstr \"%s\" \"%s\"' % (a.encode('utf-8'), b.encode('utf-8'))) - if (out != (expect + '\n').encode('utf-8')): - self.fail("comparison failed:\n" - " a=%s\n" - " b=%s\n" - " expected=%s\n" - " result=%s\n" % (`a`, `b`, `expect+'\n'`, `out`)) - - def runtest(self): - # A, B, strstr_m(A, B) - cases = [('hello', 'hello', 'hello'), - ('hello', 'goodbye', '(null)'), - ('goodbye', 'hello', '(null)'), - ('hell', 'hello', '(null)'), - ('hello', 'hell', 'hello'), - ('', '', ''), - ('a', '', 'a'), - ('', 'a', '(null)'), - ('a', 'A', '(null)'), - ('aa', 'aA', '(null)'), - ('Aa', 'aa', '(null)'), - ('%v foo', '%v', '%v foo'), - ('foo %v foo', '%v', '%v foo'), - ('foo %v', '%v', '%v'), - ('longstring ' * 100, 'longstring ' * 99, 'longstring ' * 100), - ('longstring ' * 99, 'longstring ' * 100, '(null)'), - ('longstring a' * 99, 'longstring ' * 100 + 'a', '(null)'), - ('longstring ' * 100 + 'a', 'longstring ' * 100, 'longstring ' * 100 + 'a'), - (KATAKANA_LETTER_A, KATAKANA_LETTER_A + 'bcd', '(null)'), - (KATAKANA_LETTER_A + 'bcde', KATAKANA_LETTER_A + 'bcd', KATAKANA_LETTER_A + 'bcde'), - ('d'+KATAKANA_LETTER_A + 'bcd', KATAKANA_LETTER_A + 'bcd', KATAKANA_LETTER_A + 'bcd'), - ('d'+KATAKANA_LETTER_A + 'bd', KATAKANA_LETTER_A + 'bcd', '(null)'), - - ('e'+KATAKANA_LETTER_A + 'bcdf', KATAKANA_LETTER_A + 'bcd', KATAKANA_LETTER_A + 'bcdf'), - (KATAKANA_LETTER_A, KATAKANA_LETTER_A + 'bcd', '(null)'), - (KATAKANA_LETTER_A*3, 'a', '(null)'), - ] - for a, b, expect in cases: - self.run_strstr(a, b, expect) - -# Define the tests exported by this module -tests = [StrCaseCmp, - strstr_m, - PushUCS2_Tests] - -# Handle execution of this file as a main program -if __name__ == '__main__': - comfychair.main(tests) - -# Local variables: -# coding: utf-8 -# End: diff --git a/source3/stf/unicodenames.py b/source3/stf/unicodenames.py deleted file mode 100644 index 34d0a19238..0000000000 --- a/source3/stf/unicodenames.py +++ /dev/null @@ -1,31 +0,0 @@ -#! /usr/bin/python - -# Copyright (C) 2003 by Martin Pool -# -# 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 . - - -""" -Defines symbolic names for a few UNICODE characters, to make test -source code more readable on machines that don't have all the -necessary fonts. - -You can do "import *" on this file safely. -""" - -LATIN_CAPITAL_LETTER_N_WITH_TILDE = u'\u004e' -LATIN_CAPITAL_LETTER_O_WITH_DIARESIS = u'\u00d6' -LATIN_SMALL_LETTER_O_WITH_DIARESIS = u'\u00f6' - -KATAKANA_LETTER_A = u'\u30a2' -- cgit From 2a12424e4b6da8fb3cd0ad50e14f75f0bc5132e0 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 18 May 2011 14:13:18 +1000 Subject: s3-selftest Remove unused and unimplemented info3cache test --- source3/stf/info3cache.py | 54 ----------------------------------------------- 1 file changed, 54 deletions(-) delete mode 100755 source3/stf/info3cache.py (limited to 'source3/stf') diff --git a/source3/stf/info3cache.py b/source3/stf/info3cache.py deleted file mode 100755 index 96d5a1d459..0000000000 --- a/source3/stf/info3cache.py +++ /dev/null @@ -1,54 +0,0 @@ -#!/usr/bin/python -# -# Upon a winbindd authentication, test that an info3 record is cached in -# netsamlogon_cache.tdb and cache records are removed from winbindd_cache.tdb -# - -import comfychair, stf -from samba import tdb, winbind - -# -# We want to implement the following test on a win2k native mode domain. -# -# 1. trash netsamlogon_cache.tdb -# 2. wbinfo -r DOMAIN\Administrator [FAIL] -# 3. wbinfo --auth-crap DOMAIN\Administrator%password [PASS] -# 4. wbinfo -r DOMAIN\Administrator [PASS] -# -# Also for step 3 we want to try 'wbinfo --auth-smbd' and -# 'wbinfo --auth-plaintext' -# - -# -# TODO: To implement this test we need to be able to -# -# - pass username%password combination for an invidivual winbindd request -# (so we can get the administrator SID so we can clear the info3 cache) -# -# - start/restart winbindd (to trash the winbind cache) -# -# - from samba import dynconfig (to find location of info3 cache) -# -# - be able to modify the winbindd cache (to set/reset individual winbind -# cache entries) -# -# - have --auth-crap present in HEAD -# - -class WinbindAuthCrap(comfychair.TestCase): - def runtest(self): - raise comfychair.NotRunError, "not implemented" - -class WinbindAuthSmbd(comfychair.TestCase): - def runtest(self): - # Grr - winbindd in HEAD doesn't contain the auth_smbd function - raise comfychair.NotRunError, "no auth_smbd in HEAD" - -class WinbindAuthPlaintext(comfychair.TestCase): - def runtest(self): - raise comfychair.NotRunError, "not implemented" - -tests = [WinbindAuthCrap, WinbindAuthSmbd, WinbindAuthPlaintext] - -if __name__ == "__main__": - comfychair.main(tests) -- cgit