Rev 4634: Merge fixes for per_bzrdir tests with 2a. in http://bazaar.launchpad.net/~lifeless/bzr/bug-398668

[Robert Collins]

At http://bazaar.launchpad.net/~lifeless/bzr/bug-398668

------------------------------------------------------------
revno: 4634 [merge]
revision-id: robertc at robertcollins.net-20090817074649-p0nfqwdtlvsu5ace
parent: robertc at robertcollins.net-20090817070009-b2dnb0vobtk5j66l
parent: robertc at robertcollins.net-20090817074603-l9gnd40bg6xp38t0
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bug-398668
timestamp: Mon 2009-08-17 17:46:49 +1000
message:
  Merge fixes for per_bzrdir tests with 2a.
modified:
  bzrlib/tests/per_bzrdir/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
=== modified file 'bzrlib/tests/per_bzrdir/test_bzrdir.py'
--- a/bzrlib/tests/per_bzrdir/test_bzrdir.py	2009-08-14 13:55:30 +0000
+++ b/bzrlib/tests/per_bzrdir/test_bzrdir.py	2009-08-17 07:46:03 +0000
@@ -1258,7 +1258,7 @@
         # repository is the same as the external location of the stacked-on
         # branch.
         balloon = self.make_bzrdir('balloon')
-        if isinstance(balloon, bzrdir.BzrDirMetaFormat1):
+        if isinstance(balloon._format, bzrdir.BzrDirMetaFormat1):
             stack_on = self.make_branch('stack-on', format='1.9')
         else:
             stack_on = self.make_branch('stack-on')