Changeset 839 in tailor

Timestamp:

09/24/05 20:37:49 (8 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Hash name:

20050924183749-d4f9e-fbfee2e5c6325fa1509901976503c1a9bfba4439

Message:

svn-copyfrom-and-remove-test
Add unit test that exposes a bug in the SVN log parser; SVN shows 'D' for
files that were removed after a (larger) merge and never committed.

File:

• vcpx/tests/svn.py (modified) (1 diff)

vcpx/tests/svn.py

@@ -541 +541 @@
         self.assertEqual(entry.action_kind, entry.RENAMED)
         self.assertEqual(entry.old_name, 'scripts/trac-admin')
+
+
+    COPYFROM_AND_REMOVE_TEST = """\
+<?xml version="1.0" encoding="utf-8"?>
+<log>
+<logentry
+   revision="3170">
+<author>abartlet</author>
+<date>2004-10-24T23:54:00.078045Z</date>
+<paths>
+<path
+   action="D">/branches/SAMBA_4_0/source/nsswitch/wins.c</path>
+<path
+   action="A">/branches/SAMBA_4_0/source/nsswitch/config.m4</path>
+<path
+   copyfrom-path="/branches/SAMBA_3_0/source/nsswitch"
+   copyfrom-rev="3150"
+   action="A">/branches/SAMBA_4_0/source/nsswitch</path>
+<path
+   action="M">/branches/SAMBA_4_0/source/nsswitch/wb_common.c</path>
+</paths>
+<msg>Add winbind client support back into Samba4.  This is to allow
+auth_winbind to work, and to therefore use the new ntlm_auth and
+GENSEC in an otherwise Samba3 setup.
+
+I'm not quite sure what fun-and games my svn cp caused as I merged
+this from samba_3_0, but anyway...
+
+Andrew Bartlett
+</msg>
+</logentry>
+</log>
+"""
+
+    def testCopyFromAndRemove(self):
+        """Verify the svn parser handle copyfrom+remove"""
+
+        log = StringIO(self.COPYFROM_AND_REMOVE_TEST)
+        csets = changesets_from_svnlog(log,
+                                       'http://svnanon.samba.org/samba',
+                                       '/branches/SAMBA_4_0')
+
+        self.assertEqual(len(csets), 1)
+
+        cset = csets[0]
+        self.assertEqual(len(cset.entries), 3)
+
+        entry = cset.entries[0]
+        self.assertEqual(entry.name, 'source/nsswitch/config.m4')
+        self.assertEqual(entry.action_kind, entry.ADDED)
+
+        entry = cset.entries[1]
+        self.assertEqual(entry.name, 'source/nsswitch')
+        self.assertEqual(entry.action_kind, entry.ADDED)
+
+        entry = cset.entries[2]
+        self.assertEqual(entry.name, 'source/nsswitch/wb_common.c')
+        self.assertEqual(entry.action_kind, entry.ADDED)