Patchwork [4,of,4,v2] test-manifest.py: don't test .text() with present node suffix

login
register
mail settings
Submitter Martin von Zweigbergk
Date March 26, 2015, 5:49 p.m.
Message ID <7233e76e99642a8fb5a9.1427392145@martinvonz.mtv.corp.google.com>
Download mbox | patch
Permalink /patch/8301/
State Accepted
Headers show

Comments

Martin von Zweigbergk - March 26, 2015, 5:49 p.m.
# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1427329128 25200
#      Wed Mar 25 17:18:48 2015 -0700
# Node ID 7233e76e99642a8fb5a9c0dcc989f2ccaf3487b3
# Parent  9c12d179874831c8211309995c44324f0f66efa7
test-manifest.py: don't test .text() with present node suffix

When m.text() is called after setting a nodeid with a suffix (such as
'+'), manifestdict uses the suffix-less nodeid for the text, while
treemanifest includes the suffix. It would perhaps make most sense to
raise an exception so the bug is found, but since the two
implementations behave differently, let's just not test the behavior
for now.
Matt Mackall - March 26, 2015, 10:24 p.m.
On Thu, 2015-03-26 at 10:49 -0700, Martin von Zweigbergk wrote:
> # HG changeset patch
> # User Martin von Zweigbergk <martinvonz@google.com>
> # Date 1427329128 25200
> #      Wed Mar 25 17:18:48 2015 -0700
> # Node ID 7233e76e99642a8fb5a9c0dcc989f2ccaf3487b3
> # Parent  9c12d179874831c8211309995c44324f0f66efa7
> test-manifest.py: don't test .text() with present node suffix
> 
> When m.text() is called after setting a nodeid with a suffix (such as
> '+'), manifestdict uses the suffix-less nodeid for the text, while
> treemanifest includes the suffix. It would perhaps make most sense to
> raise an exception so the bug is found, but since the two
> implementations behave differently, let's just not test the behavior
> for now.

These are queued for default, thanks.

Patch

diff -r 9c12d1798748 -r 7233e76e9964 tests/test-manifest.py
--- a/tests/test-manifest.py	Thu Mar 26 09:42:21 2015 -0700
+++ b/tests/test-manifest.py	Wed Mar 25 17:18:48 2015 -0700
@@ -136,7 +136,6 @@ 
         m2 = m.matches(match)
         self.assertEqual(want, m2['foo'])
         self.assertEqual(1, len(m2))
-        self.assertEqual(('foo\0%s\n' % HASH_1), m2.text())
         m2 = m.copy()
         self.assertEqual(want, m2['foo'])
         # suffix with iteration