summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2009-08-22 14:02:47 +0200
committerGuido Günther <agx@sigxcpu.org>2009-08-22 14:26:48 +0200
commit29cacc0286b1bd0af964fea71a889f44525f838f (patch)
treeb250db2473945fb491307b9fe1a26c6c7a92ac78
parent4f82dfb563926b7a145e093471b7ccedcae39145 (diff)
run doctests with nose
-rw-r--r--debian/control2
-rwxr-xr-xdebian/rules1
-rw-r--r--gbp/command_wrappers.py8
-rw-r--r--gbp/deb_utils.py8
-rw-r--r--gbp/git_utils.py9
5 files changed, 2 insertions, 26 deletions
diff --git a/debian/control b/debian/control
index 714c9a33..23e51b55 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: vcs
Priority: optional
Maintainer: Guido Günther <agx@sigxcpu.org>
Build-Depends: cdbs, debhelper (>= 5), python-dev, python-support (>= 0.3),
- pychecker, gtk-doc-tools, sgml2x, docbook-utils, jade, python-dateutil
+ pychecker, gtk-doc-tools, sgml2x, docbook-utils, jade, python-dateutil, python-nose
Standards-Version: 3.8.2
Vcs-Git: http://honk.sigxcpu.org/git/git-buildpackage.git/
Vcs-Browser: http://git.debian.org/?p=users/agx/git-buildpackage.git
diff --git a/debian/rules b/debian/rules
index 057bf73f..d1b764a8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,6 +25,7 @@ $(MANUAL): docs/manual.sgml docs/chapters/*.sgml docs/manpages/*.sgml
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
checks: $(PYCHECKS)
+ nosetests --with-doctest
endif
%.py: %
diff --git a/gbp/command_wrappers.py b/gbp/command_wrappers.py
index 8cfa7cb9..8f6f7fe4 100644
--- a/gbp/command_wrappers.py
+++ b/gbp/command_wrappers.py
@@ -301,12 +301,4 @@ def copy_from(orig_dir, filters=[]):
raise GbpError, "Cannot copy files, pipe failed."
return [ os.path.normpath(f) for f in files if files ]
-
-def _test():
- import doctest
- doctest.testmod()
-
-if __name__ == '__main__':
- _test()
-
# vim:et:ts=4:sw=4:et:sts=4:ai:set list listchars=tab\:»·,trail\:·:
diff --git a/gbp/deb_utils.py b/gbp/deb_utils.py
index 2af2fdf9..6a60f9b5 100644
--- a/gbp/deb_utils.py
+++ b/gbp/deb_utils.py
@@ -267,12 +267,4 @@ def guess_upstream_version(archive, version_regex=r''):
if m:
return m.group('version')
-
-def _test():
- import doctest
- doctest.testmod()
-
-if __name__ == '__main__':
- _test()
-
# vim:et:ts=4:sw=4:et:sts=4:ai:set list listchars=tab\:»·,trail\:·:
diff --git a/gbp/git_utils.py b/gbp/git_utils.py
index d89f778e..cf22718a 100644
--- a/gbp/git_utils.py
+++ b/gbp/git_utils.py
@@ -230,13 +230,4 @@ def rfc822_date_to_git(rfc822_date):
tz = d.strftime("%z")
return '%d %s' % (seconds, tz)
-
-def _test():
- import doctest
- doctest.testmod()
-
-
-if __name__ == '__main__':
- _test()
-
# vim:et:ts=4:sw=4:et:sts=4:ai:set list listchars=tab\:»·,trail\:·: