[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#685853: marked as done (unblock: cvs2svn/2.3.0-3)

Your message dated Sat, 01 Sep 2012 18:16:14 +0100
with message-id <1346519774.7606.62.camel@jacala.jungle.funky-badger.org>
and subject line Re: unblock: cvs2svn/2.3.0-3
has caused the Debian Bug report #685853,
regarding unblock: cvs2svn/2.3.0-3
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
685853: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=685853
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: freeze-exception
thanks

Hi Release Team,

Previously cvs2svn tests were failing due to a subversion behavior
change. The fix is from upstream[1] SVN r5381 . The debdiff is attached.

Regards,
Laszlo/GCS
[1] http://cvs2svn.tigris.org/ds/viewMessage.do?dsForumId=1716&dsMessageId=2950121

diff -u cvs2svn-2.3.0/debian/changelog cvs2svn-2.3.0/debian/changelog
--- cvs2svn-2.3.0/debian/changelog
+++ cvs2svn-2.3.0/debian/changelog
@@ -1,3 +1,10 @@
+cvs2svn (2.3.0-3) unstable; urgency=low
+
+  * Fix some test cases to deal with non-deterministic dump output
+    (closes: #665028), thanks to Salvatore Bonaccorso for the heads-up.
+
+ -- Laszlo Boszormenyi (GCS) <gcs@debian.hu>  Sat, 25 Aug 2012 13:21:49 +0200
+
 cvs2svn (2.3.0-2) unstable; urgency=low
 
   * Pass '--prefix=/usr' to 'setup.py install' needed for the upcoming Python
diff -u cvs2svn-2.3.0/debian/rules cvs2svn-2.3.0/debian/rules
--- cvs2svn-2.3.0/debian/rules
+++ cvs2svn-2.3.0/debian/rules
@@ -29,7 +29,8 @@
 	python setup.py clean
 
 	# clean up
-	rm -rf $(CURDIR)/build/ $(CURDIR)/tmp/ $(CURDIR)/cvs2svn-tmp/
+	rm -rf $(CURDIR)/build/ $(CURDIR)/tmp/ $(CURDIR)/cvs2svn-tmp/ \
+	$(CURDIR)/svn-test-work/local_tmp/
 	rm -f $(CURDIR)/svntest/*.pyc \
 	$(CURDIR)/cvs2svn_rcsparse/*.pyc $(CURDIR)/cvs2svn_lib/*.pyc
 	rm -rf $(CURDIR)/debian/locale/
only in patch2:
unchanged:
--- cvs2svn-2.3.0.orig/run-tests.py
+++ cvs2svn-2.3.0/run-tests.py
@@ -3174,19 +3174,15 @@
   "verify that --use-internal-co works"
 
   rcs_conv = ensure_conversion(
-      'main', args=['--use-rcs', '--default-eol=native'],
+      'main', args=['--use-rcs', '--default-eol=native'], dumpfile='use-rcs-rcs.dump',
       )
   conv = ensure_conversion(
-      'main', args=['--default-eol=native'],
+      'main', args=['--default-eol=native'], dumpfile='use-rcs-int.dump',
       )
   if conv.output_found(r'WARNING\: internal problem\: leftover revisions'):
     raise Failure()
-  rcs_lines = run_program(
-      svntest.main.svnadmin_binary, None, 'dump', '-q', '-r', '1:HEAD',
-      rcs_conv.repos)
-  lines = run_program(
-      svntest.main.svnadmin_binary, None, 'dump', '-q', '-r', '1:HEAD',
-      conv.repos)
+  rcs_lines = list(open(rcs_conv.dumpfile, 'rb'))
+  lines = list(open(conv.dumpfile, 'rb'))
   # Compare all lines following the repository UUID:
   if lines[3:] != rcs_lines[3:]:
     raise Failure()
@@ -3199,19 +3195,17 @@
   rcs_conv = ensure_conversion(
       'internal-co',
       args=['--use-rcs', '--exclude=BRANCH', '--default-eol=native'],
+      dumpfile='internal-co-exclude-rcs.dump',
       )
   conv = ensure_conversion(
       'internal-co',
       args=['--exclude=BRANCH', '--default-eol=native'],
+      dumpfile='internal-co-exclude-int.dump',
       )
   if conv.output_found(r'WARNING\: internal problem\: leftover revisions'):
     raise Failure()
-  rcs_lines = run_program(
-      svntest.main.svnadmin_binary, None, 'dump', '-q', '-r', '1:HEAD',
-      rcs_conv.repos)
-  lines = run_program(
-      svntest.main.svnadmin_binary, None, 'dump', '-q', '-r', '1:HEAD',
-      conv.repos)
+  rcs_lines = list(open(rcs_conv.dumpfile, 'rb'))
+  lines = list(open(conv.dumpfile, 'rb'))
   # Compare all lines following the repository UUID:
   if lines[3:] != rcs_lines[3:]:
     raise Failure()

--- End Message ---
--- Begin Message --- 
On Sat, 2012-08-25 at 12:52 +0000, Laszlo Boszormenyi (GCS) wrote:
> Previously cvs2svn tests were failing due to a subversion behavior
> change. The fix is from upstream[1] SVN r5381 . The debdiff is attached.
> 
> Regards,
> Laszlo/GCS
> [1] http://cvs2svn.tigris.org/ds/viewMessage.do?dsForumId=1716&dsMessageId=2950121

Unblocked by Julien.

Regards,

Adam

--- End Message ---
Reply to: