Mercurial > dtrx / changeset

--- a/INSTALL	Sat Jul 04 11:26:19 2009 -0400
+++ b/INSTALL	Sun Aug 30 11:18:32 2009 -0400
@@ -73,9 +73,9 @@
 
    python tests/compare.py
 
-To run the tests, you'll need the `syck module`_.
+To run the tests, you'll need the `PyYAML module`_.
 
-.. _syck module: http://whytheluckystiff.net/syck/
+.. _PyYAML module: http://pyyaml.org/
 
 If everything's in order, all the tests should pass.  Note that some of
 them will fail if some of the programs listed above aren't installed on

--- a/NEWS	Sat Jul 04 11:26:19 2009 -0400
+++ b/NEWS	Sun Aug 30 11:18:32 2009 -0400
@@ -1,6 +1,15 @@
 Changes in dtrx
 ===============
 
+Version 6.6
+-----------
+
+Other changes
+~~~~~~~~~~~~~
+
+ * The tests now use the PyYAML library, instead of the abandoned Syck.
+   Thanks to Miguelangel Jose Freitas Loreto for a patch.
+
 Version 6.5
 -----------
 

--- a/tests/compare.py	Sat Jul 04 11:26:19 2009 -0400
+++ b/tests/compare.py	Sun Aug 30 11:18:32 2009 -0400
@@ -20,7 +20,7 @@
 import os
 import re
 import subprocess
-import syck
+import yaml
 import sys
 import tempfile
 
@@ -220,7 +220,7 @@
 
 
 test_db = open('tests.yml')
-test_data = syck.load(test_db.read(-1))
+test_data = yaml.load(test_db.read(-1))
 test_db.close()
 tests = [ExtractorTest(**data) for data in test_data]
 for original_data in test_data:

--- a/tests/tests.yml	Sat Jul 04 11:26:19 2009 -0400
+++ b/tests/tests.yml	Sun Aug 30 11:18:32 2009 -0400
@@ -191,7 +191,7 @@
   filenames: tests.yml
   options: -n -qq
   error: true
-  antigrep: .
+  antigrep: '.'
 
 - name: can't write to directory
   directory: inside-dir
@@ -461,7 +461,7 @@
   input: |
     h
     o
-  grep: "contains 2 other archive file\(s\), out of 2 file\(s\)"
+  grep: 'contains 2 other archive file\(s\), out of 2 file\(s\)'
   baseline: |
     tar -xf $1
     cd subdir
@@ -511,7 +511,7 @@
   filenames: trickery.tar.gz
   prerun: cp ${1}test-1.23.zip ${1}trickery.tar.gz
   cleanup: rm -f ${1}trickery.tar.gz
-  antigrep: .
+  antigrep: '.'
   baseline: |
     mkdir trickery
     cd trickery
@@ -646,7 +646,7 @@
     r
     l
     n
-  grep: "^test-deep-recursion/subsubdir/test-text\.gz$"
+  grep: '^test-deep-recursion/subsubdir/test-text\.gz$'
 
 - name: partly failed extraction
   options: -n
@@ -682,4 +682,4 @@
 - name: listing empty archive
   filenames: test-empty.tar.bz2
   options: -l
-  antigrep: .
+  antigrep: '.'