From 1e4647627b386b83f49c5a42e0c12b43439623c4 Mon Sep 17 00:00:00 2001 From: dol-sen Date: Thu, 21 Jul 2011 19:41:48 -0700 Subject: some docstring test updates --- layman/overlays/tar.py | 8 ++++---- layman/tests/dtest.py | 6 ++++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/layman/overlays/tar.py b/layman/overlays/tar.py index ac030d8..e6c0d45 100644 --- a/layman/overlays/tar.py +++ b/layman/overlays/tar.py @@ -40,7 +40,7 @@ from layman.overlays.source import OverlaySource, require_supported class TarOverlay(OverlaySource): ''' Handles tar overlays. - >>> from layman.debug import OUT + >>> from layman.output import Message >>> import xml.etree.ElementTree as ET # Python 2.5 >>> repo = ET.Element('repo') >>> repo_name = ET.Element('name') @@ -57,12 +57,12 @@ class TarOverlay(OverlaySource): >>> subpath = ET.Element('subpath') >>> subpath.text = 'layman-test' >>> repo[:] = [repo_name, desc, owner, source, subpath] - >>> config = {'tar_command':'/bin/tar'} + >>> config = {'tar_command':'/bin/tar', 'output': Message()} >>> testdir = os.tmpnam() >>> os.mkdir(testdir) >>> from layman.overlays.overlay import Overlay - >>> a = Overlay(repo, config, quiet=False) - >>> OUT.color_off() + >>> a = Overlay(config, repo, quiet=False) + >>> config['output'].set_colorize(False) >>> a.add(testdir) #doctest: +ELLIPSIS * Running... # /bin/tar -v -x -f... >>> sorted(os.listdir(testdir + '/dummy')) diff --git a/layman/tests/dtest.py b/layman/tests/dtest.py index 5edd6ce..15e0900 100755 --- a/layman/tests/dtest.py +++ b/layman/tests/dtest.py @@ -49,7 +49,9 @@ import unittest, doctest # clean but no testing : CN # unclean but no testing: UN -import layman.action #CT +#import layman.api #CT +import layman.argsparser #CT +import layman.cli #CT import layman.config #CT import layman.db #CT import layman.dbbase #CT @@ -65,7 +67,7 @@ import layman.overlays.tar #CT def test_suite(): return unittest.TestSuite(( - doctest.DocTestSuite(layman.action), + #doctest.DocTestSuite(layman.api), doctest.DocTestSuite(layman.config), doctest.DocTestSuite(layman.db), doctest.DocTestSuite(layman.dbbase), -- cgit v1.2.3-1-g7c22