diff options
Diffstat (limited to 'source3/stf')
| -rw-r--r-- | source3/stf/.cvsignore | 3 | ||||
| -rw-r--r-- | source3/stf/standardcheck.py | 3 | ||||
| -rwxr-xr-x | source3/stf/strings.py | 46 |
3 files changed, 6 insertions, 46 deletions
diff --git a/source3/stf/.cvsignore b/source3/stf/.cvsignore index bcf4150606..7e99e367f8 100644 --- a/source3/stf/.cvsignore +++ b/source3/stf/.cvsignore @@ -1,2 +1 @@ -*.pyc -testtmp +*.pyc
\ No newline at end of file diff --git a/source3/stf/standardcheck.py b/source3/stf/standardcheck.py index bec21b8ec5..5af1c78376 100644 --- a/source3/stf/standardcheck.py +++ b/source3/stf/standardcheck.py @@ -22,13 +22,12 @@ """These tests are run by Samba's "make check".""" import strings, comfychair -import smbcontrol # There should not be any actual tests in here: this file just serves # to define the ones run by default. They're imported from other # modules. -tests = strings.tests + smbcontrol.tests +tests = strings.tests if __name__ == '__main__': comfychair.main(tests) diff --git a/source3/stf/strings.py b/source3/stf/strings.py index 328849b1ce..8fc12d4e39 100755 --- a/source3/stf/strings.py +++ b/source3/stf/strings.py @@ -1,4 +1,4 @@ -#! /usr/bin/python +#! /usr/bin/python # Comfychair test cases for Samba string functions. @@ -19,22 +19,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 # USA -# 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: @@ -43,29 +28,12 @@ def signum(a): 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): +class StrCaseCmp_Ascii_Tests(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'))) + out, err = self.runcmd('t_strcmp \"%s\" \"%s\"' % (a, b)) if signum(int(out)) != expect: self.fail("comparison failed:\n" " a=%s\n" @@ -88,20 +56,14 @@ class StrCaseCmp(comfychair.TestCase): ('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) # Define the tests exported by this module -tests = [StrCaseCmp, - PushUCS2_Tests] +tests = [StrCaseCmp_Ascii_Tests] # Handle execution of this file as a main program if __name__ == '__main__': comfychair.main(tests) -# Local variables: -# coding: utf-8 -# End: |