Merge lp:~maxb/bzr-cvsps-import/fix-test into lp:bzr-cvsps-import

[Max Bowsher]

Fix test_real_cvs to expect paths including the module '.'

[Vincent Ladeuil (vila)]

<vila> maxb: this fix looks and feels correct, yet... I should miss something. Why did it fail ?
<jelmer> it also looks good here, but my CVS foo is weak.
<maxb> Because of paths containing /./ which were not expected
<vila> Haaaa

Please mention that in a comment, otherwise: good to land !

review: Approve

[Max Bowsher (maxb)]

<jelmer> maxb: did r64 break the testsuite?
<maxb> oh
<maxb> yes it probably did
<maxb> hmm
<maxb> Perhaps this deserves further examination then

[John A Meinel (jameinel)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 2/19/2011 2:11 AM, Max Bowsher wrote:
> Max Bowsher has proposed merging lp:~maxb/bzr-cvsps-import/fix-test into lp:bzr-cvsps-import.
>
> Requested reviews:
> Bazaar Developers (bzr)
>
> For more details, see:
> https://code.launchpad.net/~maxb/bzr-cvsps-import/fix-test/+merge/50421

Off-hand this feels like the wrong fix. Since '.' is a special module,
it doesn't seem like it should be present in the path that files are
being imported from.

At least, importing foo/./bar seems weird, even if it isn't illegal.

 review: needsinfo

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk1uFHcACgkQJdeBCYSNAAMM0wCg0lzSZVC94myXmQ7Xk2u8YEZ9
QPYAoIkf4AxCUwHFm4eAhuIVXI89wsDe
=Edky
-----END PGP SIGNATURE-----

review: Needs Information

Unmerged revisions

65. By Max Bowsher on 2011-02-19

Fix test_real_cvs to expect paths including the module '.'

=== modified file 'test_cvsps_import.py'
--- test_cvsps_import.py	2007-09-26 16:46:11 +0000
+++ test_cvsps_import.py	2011-02-19 01:12:11 +0000
@@ -760,23 +760,28 @@
         So this test is longer than we would generally prefer.
         """
         self.setup_basic_tree()
-        a_control = osutils.pathjoin(self.cvs_root, 'a,v')
-        a_attic_control = osutils.pathjoin(self.cvs_root, 'Attic', 'a,v')
+
+        # module_root matches what the CVSUpdater instantiated later will see
+        # as the root of the module it addresses
+        module_root = osutils.pathjoin(self.cvs_root, '.')
+
+        a_control = osutils.pathjoin(module_root, 'a,v')
+        a_attic_control = osutils.pathjoin(module_root, 'Attic', 'a,v')
         self.failUnlessExists(a_control)
         self.failIfExists(a_attic_control)
 
-        b_control = osutils.pathjoin(self.cvs_root, 'sub', 'b,v')
-        b_attic_control = osutils.pathjoin(self.cvs_root, 'sub', 'Attic', 'b,v')
+        b_control = osutils.pathjoin(module_root, 'sub', 'b,v')
+        b_attic_control = osutils.pathjoin(module_root, 'sub', 'Attic', 'b,v')
         self.failUnlessExists(b_control)
         self.failIfExists(b_attic_control)
 
-        c_control = osutils.pathjoin(self.cvs_root, 'c,v')
-        c_attic_control = osutils.pathjoin(self.cvs_root, 'Attic', 'c,v')
+        c_control = osutils.pathjoin(module_root, 'c,v')
+        c_attic_control = osutils.pathjoin(module_root, 'Attic', 'c,v')
         self.failIfExists(c_control)
         self.failUnlessExists(c_attic_control)
 
-        d_control = osutils.pathjoin(self.cvs_root, 'sub', 'd,v')
-        d_attic_control = osutils.pathjoin(self.cvs_root, 'sub', 'Attic', 'd,v')
+        d_control = osutils.pathjoin(module_root, 'sub', 'd,v')
+        d_attic_control = osutils.pathjoin(module_root, 'sub', 'Attic', 'd,v')
         self.failIfExists(d_control)
         self.failUnlessExists(d_attic_control)