twitch153 14/10/18 21:34:34 Modified: layman-2.2.0-removes-doctest-remnants.patch Log: Removes dtest.py in src_prepare() instead of patch, bug #525806 (Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key A8C8FBCF)
Revision Changes Path 1.3 app-portage/layman/files/layman-2.2.0-removes-doctest-remnants.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-portage/layman/files/layman-2.2.0-removes-doctest-remnants.patch?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-portage/layman/files/layman-2.2.0-removes-doctest-remnants.patch?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-portage/layman/files/layman-2.2.0-removes-doctest-remnants.patch?r1=1.2&r2=1.3 Index: layman-2.2.0-removes-doctest-remnants.patch =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-portage/layman/files/layman-2.2.0-removes-doctest-remnants.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- layman-2.2.0-removes-doctest-remnants.patch 18 Oct 2014 19:28:57 -0000 1.2 +++ layman-2.2.0-removes-doctest-remnants.patch 18 Oct 2014 21:34:34 -0000 1.3 @@ -188,102 +188,6 @@ - doctest.testmod(sys.modules[__name__]) - - resetwarnings() ---- a/layman/tests/dtest.py 2014-10-18 14:27:13.254842117 -0400 -+++ /dev/null 2014-10-18 08:55:00.218326161 -0400 -@@ -1,93 +0,0 @@ --#!/usr/bin/python --# -*- coding: utf-8 -*- --################################################################################# --# LAYMAN DOCTEST AGGREGATOR --################################################################################# --# File: dtest.py --# --# Combines the doctests that are available for the different modules --# --# Copyright: --# (c) 2005 - 2008 Gunnar Wrobel --# Distributed under the terms of the GNU General Public License v2 --# --# Author(s): --# Gunnar Wrobel <wro...@gentoo.org> --# --'''Aggregates doctests from all modules that provide such tests.''' -- --__version__ = '$Id: layman-2.2.0-removes-doctest-remnants.patch,v 1.2 2014/10/18 19:28:57 twitch153 Exp $' -- --#=============================================================================== --# --# Dependencies --# --#------------------------------------------------------------------------------- -- --import unittest, doctest -- --# On module creation: -- --# 1.) Check header section (copyright notice) --# 2.) Add module doc string --# 3.) Add version string --# 4.) Add testing handler at bottom of module --# 5.) Add module into tests/dtest.py. Check that tests run through --# 6.) Run pylint over the code. Fix any reasonable complaints. --# 7.) Whitespace clean the buffer. --# 8.) Add svn:keywords "Id" to file. -- --# On module change: -- --# 1.) Check header section (copyright notice) --# 5.) Check that tests run through --# 6.) Run pylint over the code. Fix any reasonable complaints. --# 7.) Whitespace clean the buffer. -- --# clean modules : CT --# not yet clean : UT --# clean but no testing : CN --# unclean but no testing: UN -- --import layman.api #CT --import layman.argsparser #CT --import layman.cli #CT --import layman.config #CT --import layman.db #CT --import layman.dbbase #CT --import layman.utils #CT --import layman.overlays.overlay #CT --import layman.overlays.tar #CT -- --#=============================================================================== --# --# Test Suite --# --#------------------------------------------------------------------------------- -- --def test_suite(): -- return unittest.TestSuite(( -- doctest.DocTestSuite(layman.api), -- doctest.DocTestSuite(layman.config), -- doctest.DocTestSuite(layman.argsparser), -- doctest.DocTestSuite(layman.db), -- doctest.DocTestSuite(layman.dbbase), -- doctest.DocTestSuite(layman.utils), -- doctest.DocTestSuite(layman.overlays.overlay), -- doctest.DocTestSuite(layman.overlays.tar), -- )) -- --#=============================================================================== --# --# Run Testing --# --#------------------------------------------------------------------------------- -- --if __name__ == '__main__': -- # Ignore warnings here. We are just testing -- from warnings import filterwarnings, resetwarnings -- filterwarnings('ignore') -- -- unittest.main(defaultTest='test_suite') -- -- resetwarnings() --- a/layman/utils.py 2014-10-18 14:27:13.254842117 -0400 +++ b/layman/utils.py 2014-10-18 14:30:24.088851247 -0400 @@ -347,14 +347,3 @@
