Rev 3619: push doesn't notify because it doesn't notice by default. in http://bzr.arbash-meinel.com/branches/bzr/1.6-dev/stacking_policy

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/1.6-dev/stacking_policy

------------------------------------------------------------
revno: 3619
revision-id: john at arbash-meinel.com-20080819214515-7wsqo3bdfui2lejq
parent: john at arbash-meinel.com-20080819213740-x0z2gh94t15ofcko
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: stacking_policy
timestamp: Tue 2008-08-19 16:45:15 -0500
message:
  push doesn't notify because it doesn't notice by default.
modified:
  bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
-------------- next part --------------
=== modified file 'bzrlib/tests/blackbox/test_push.py'
--- a/bzrlib/tests/blackbox/test_push.py	2008-08-19 21:04:22 +0000
+++ b/bzrlib/tests/blackbox/test_push.py	2008-08-19 21:45:15 +0000
@@ -342,13 +342,15 @@
         self.assertEqual('', out)
         self.assertFalse(self.get_transport('published').has('.'))
 
-    def test_push_notices_default_stacking(self):
+    def test_push_notifies_default_stacking(self):
         self.make_branch('stack_on', format='development1')
         self.make_bzrdir('.').get_config().set_default_stack_on('stack_on')
         self.make_branch('from', format='development1')
         out, err = self.run_bzr('push -d from to')
-        self.assertContainsRe(err,
-                              'Using default stacking branch stack_on at .*')
+        # XXX: Determining stacking from a containing bzrdir has been
+        #      explicitly disabled.
+        self.assertNotContainsRe(err,
+                                 'Using default stacking branch stack_on at .*')
 
 
 class RedirectingMemoryTransport(MemoryTransport):