Rev 6028: More tests, and a small fix for the regex. in http://bazaar.launchpad.net/~jameinel/bzr/2.5-up-to-date-609187

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/bzr/2.5-up-to-date-609187

------------------------------------------------------------
revno: 6028
revision-id: john at arbash-meinel.com-20110718160536-b9irkw7kpze28035
parent: john at arbash-meinel.com-20110718142220-nwylw659oip1ene9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.5-up-to-date-609187
timestamp: Mon 2011-07-18 18:05:36 +0200
message:
  More tests, and a small fix for the regex.
-------------- next part --------------
=== modified file 'bzrlib/plugins/launchpad/__init__.py'
--- a/bzrlib/plugins/launchpad/__init__.py	2011-07-18 14:22:20 +0000
+++ b/bzrlib/plugins/launchpad/__init__.py	2011-07-18 16:05:36 +0000
@@ -469,7 +469,7 @@
 
 
 package_branch = lazy_regex.lazy_compile(
-    r'bazaar.launchpad.net.*/'
+    r'bazaar.launchpad.net.*?/'
     r'(?P<user>~[^/]+/)?(?P<archive>ubuntu|debian)/(?P<series>[^/]+/)?'
     r'(?P<project>[^/]+)(?P<branch>/[^/]+)?'
     )

=== modified file 'bzrlib/plugins/launchpad/test_lp_api_lite.py'
--- a/bzrlib/plugins/launchpad/test_lp_api_lite.py	2011-07-18 14:22:20 +0000
+++ b/bzrlib/plugins/launchpad/test_lp_api_lite.py	2011-07-18 16:05:36 +0000
@@ -277,3 +277,16 @@
         self.assertPackageBranchRe(
             'http://bazaar.launchpad.net/+branch/ubuntu/foo',
             None, 'ubuntu', None, 'foo')
+        self.assertPackageBranchRe(
+            'http://bazaar.launchpad.net/+branch/ubuntu/natty/foo',
+            None, 'ubuntu', 'natty/', 'foo')
+        self.assertPackageBranchRe(
+            'http://bazaar.launchpad.net/+branch/debian/foo',
+            None, 'debian', None, 'foo')
+        self.assertPackageBranchRe(
+            'http://bazaar.launchpad.net/+branch/debian/sid/foo',
+            None, 'debian', 'sid/', 'foo')
+        self.assertPackageBranchRe(
+            'http://bazaar.launchpad.net/+branch'
+            '/~ubuntu-branches/ubuntu/natty/foo/natty',
+            '~ubuntu-branches/', 'ubuntu', 'natty/', 'foo')