[Pkg-python-debian-commits] r89 trunk: Merge moving tests to a separate subdirectory from Filippo.

Adeodato Simó dato at net.com.org.es
Thu Nov 29 17:48:52 UTC 2007


------------------------------------------------------------
revno: 89
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: trunk
timestamp: Thu 2007-11-29 18:48:52 +0100
message:
  Merge moving tests to a separate subdirectory from Filippo.
added:
  tests/
renamed:
  debian_bundle/test-broken.deb.uu => tests/test-broken.deb.uu
  debian_bundle/test.deb.uu => tests/test.deb.uu
  debian_bundle/test_changelog => tests/test_changelog
  debian_bundle/test_deb822.py => tests/test_deb822.py
  debian_bundle/test_debfile.py => tests/test_debfile.py
  debian_bundle/test_debtags.py => tests/test_debtags.py
  debian_bundle/test_modify_changelog1 => tests/test_modify_changelog1
  debian_bundle/test_modify_changelog2 => tests/test_modify_changelog2
  debian_bundle/test_modify_changelog3 => tests/test_modify_changelog3
  debian_bundle/test_strange_changelog => tests/test_strange_changelog
  debian_bundle/test_tagdb => tests/test_tagdb
modified:
  debian/changelog
  debian/rules
  tests/test_deb822.py
  tests/test_debfile.py
  tests/test_debtags.py
    ------------------------------------------------------------
    revno: 88.1.1
    committer: filippo at debian.org
    branch nick: python-debian
    timestamp: Thu 2007-11-29 16:27:12 +0100
    message:
      move tests to proper directory
    added:
      tests/
    renamed:
      debian_bundle/test-broken.deb.uu => tests/test-broken.deb.uu
      debian_bundle/test.deb.uu => tests/test.deb.uu
      debian_bundle/test_changelog => tests/test_changelog
      debian_bundle/test_deb822.py => tests/test_deb822.py
      debian_bundle/test_debfile.py => tests/test_debfile.py
      debian_bundle/test_debtags.py => tests/test_debtags.py
      debian_bundle/test_modify_changelog1 => tests/test_modify_changelog1
      debian_bundle/test_modify_changelog2 => tests/test_modify_changelog2
      debian_bundle/test_modify_changelog3 => tests/test_modify_changelog3
      debian_bundle/test_strange_changelog => tests/test_strange_changelog
      debian_bundle/test_tagdb => tests/test_tagdb
    modified:
      debian/rules
      tests/test_deb822.py
      tests/test_debfile.py
      tests/test_debtags.py
    ------------------------------------------------------------
    revno: 88.1.2
    committer: Adeodato Simó <dato at net.com.org.es>
    branch nick: pd.move-tests
    timestamp: Thu 2007-11-29 18:03:50 +0100
    message:
      Put ../debian_bundle in the first position of sys.path.
    modified:
      tests/test_deb822.py
      tests/test_debfile.py
      tests/test_debtags.py
-------------- next part --------------
=== added directory 'tests'
=== renamed file 'debian_bundle/test-broken.deb.uu' => 'tests/test-broken.deb.uu'
=== renamed file 'debian_bundle/test.deb.uu' => 'tests/test.deb.uu'
=== renamed file 'debian_bundle/test_changelog' => 'tests/test_changelog'
=== renamed file 'debian_bundle/test_deb822.py' => 'tests/test_deb822.py'
--- a/debian_bundle/test_deb822.py	2007-09-27 05:02:53 +0000
+++ b/tests/test_deb822.py	2007-11-29 17:03:50 +0000
@@ -18,10 +18,14 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 import re
-import deb822
+import sys
 import unittest
 from StringIO import StringIO
 
+sys.path.insert(0, '../debian_bundle/')
+
+import deb822
+
 # Keep the test suite compatible with python2.3 for now
 try:
     sorted

=== renamed file 'debian_bundle/test_debfile.py' => 'tests/test_debfile.py'
--- a/debian_bundle/test_debfile.py	2007-08-20 10:48:08 +0000
+++ b/tests/test_debfile.py	2007-11-29 17:03:50 +0000
@@ -25,13 +25,15 @@
 import tempfile
 import uu
 
+sys.path.insert(0, '../debian_bundle/')
+
 import arfile 
 import debfile
 
 class TestArFile(unittest.TestCase):
 
     def setUp(self):
-        os.system("ar r test.ar test_debfile.py arfile.py debfile.py >/dev/null 2>&1") 
+        os.system("ar r test.ar test_debfile.py test_changelog test_deb822.py >/dev/null 2>&1") 
         assert os.path.exists("test.ar")
         self.testmembers = [ x.strip()
                 for x in os.popen("ar t test.ar").readlines() ]

=== renamed file 'debian_bundle/test_debtags.py' => 'tests/test_debtags.py'
--- a/debian_bundle/test_debtags.py	2006-11-28 11:03:27 +0000
+++ b/tests/test_debtags.py	2007-11-29 17:03:50 +0000
@@ -17,9 +17,12 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-import debtags
+import sys
 import unittest
 
+sys.path.insert(0, '../debian_bundle/')
+import debtags 
+
 class TestDebtags(unittest.TestCase):
     def mkdb(self):
         db = debtags.DB()

=== renamed file 'debian_bundle/test_modify_changelog1' => 'tests/test_modify_changelog1'
=== renamed file 'debian_bundle/test_modify_changelog2' => 'tests/test_modify_changelog2'
=== renamed file 'debian_bundle/test_modify_changelog3' => 'tests/test_modify_changelog3'
=== renamed file 'debian_bundle/test_strange_changelog' => 'tests/test_strange_changelog'
=== renamed file 'debian_bundle/test_tagdb' => 'tests/test_tagdb'
=== modified file 'debian/changelog'
--- a/debian/changelog	2007-11-27 23:26:49 +0000
+++ b/debian/changelog	2007-11-29 17:48:52 +0000
@@ -16,6 +16,9 @@
     - mention the debfile module in the long description
     - promote Vcs-Bzr to a real field, now that dpkg supports it
 
+  [ Filippo Giunchedi ]
+  * Move tests to a separate subdirectory.
+
  -- John Wright <jsw at debian.org>  Tue, 27 Nov 2007 16:25:33 -0700
 
 python-debian (0.1.6) unstable; urgency=low

=== modified file 'debian/rules'
--- a/debian/rules	2007-07-18 21:39:59 +0000
+++ b/debian/rules	2007-11-29 15:27:12 +0000
@@ -15,12 +15,13 @@
 
 	# Add here commands to compile the package.
 	python setup.py build
-	# The tests for changelog and debtags need to be run from the same dir as
-	# the files.
-	cd debian_bundle && python test_deb822.py
-	cd debian_bundle && python test_debtags.py
-	cd debian_bundle && python changelog.py
-	cd debian_bundle && python test_debfile.py
+	
+	# run the tests
+	cd tests && \
+		for f in deb822 debfile debtags; do \
+			./test_$$f.py ; \
+		done 
+
 	#python debian_bundle/python_support.py
 	debian_bundle/doc-debtags > README.debtags
 



More information about the pkg-python-debian-commits mailing list