Merge lp://staging/~gary/launchpadlib/reenable_tests into lp://staging/~launchpad-pqm/launchpadlib/devel

Proposed by Gary Poster
Status: Merged
Approved by: Francis J. Lacoste
Approved revision: 46
Merged at revision: not available
Proposed branch: lp://staging/~gary/launchpadlib/reenable_tests
Merge into: lp://staging/~launchpad-pqm/launchpadlib/devel
Diff against target: None lines
To merge this branch: bzr merge lp://staging/~gary/launchpadlib/reenable_tests
Reviewer Review Type Date Requested Status
Francis J. Lacoste (community) Approve
Review via email: mp+4831@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Gary Poster (gary) wrote :

This branch hooks up the new standalone launchpadlib tests with the buildout testrunner.

It also nominally works with ``./setup.py test`` but it actually fails the first time you run it, and the succeeds subsequently. I didn't think it was worth investigating at this point in time.

This also adds the ZPL license for the bootstrap code, and excludes the zc.buildout bits when you make a distribution.

Finally, it updates the date of release for today, since I did not release it yesterday.

Revision history for this message
Francis J. Lacoste (flacoste) wrote :

On March 24, 2009, Gary Poster wrote:
> Gary Poster has proposed merging lp:~gary/launchpadlib/reenable_tests into
> lp:launchpadlib.
>
> Requested reviews:
> launchpadlib developers (launchpadlib-developers)
>
> This branch hooks up the new standalone launchpadlib tests with the
> buildout testrunner.
>
> It also nominally works with ``./setup.py test`` but it actually fails the
> first time you run it, and the succeeds subsequently. I didn't think it
> was worth investigating at this point in time.
>
> This also adds the ZPL license for the bootstrap code, and excludes the
> zc.buildout bits when you make a distribution.
>
> Finally, it updates the date of release for today, since I did not release
> it yesterday.

 status approved
 review approve

Looks good.

--
Francis J. Lacoste
<email address hidden>

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== added file 'MANIFEST.in'
--- MANIFEST.in 1970-01-01 00:00:00 +0000
+++ MANIFEST.in 2009-03-24 13:26:45 +0000
@@ -0,0 +1,2 @@
1exclude MANIFEST.in buildout.cfg bootstrap.py .bzrignore
2prune _bootstrap
03
=== modified file 'README.txt'
--- README.txt 2009-03-23 21:50:35 +0000
+++ README.txt 2009-03-23 22:48:16 +0000
@@ -44,10 +44,3 @@
44Please submit bug reports to44Please submit bug reports to
4545
46 https://bugs.launchpad.net/launchpadlib46 https://bugs.launchpad.net/launchpadlib
47
48
49== Tests ==
50
51launchpadlib's test suite can be run using the nose test runner. It
52should work simply running 'nosetests' from the directory where this
53README file is located.
5447
=== added directory '_bootstrap'
=== added file '_bootstrap/COPYRIGHT.txt'
--- _bootstrap/COPYRIGHT.txt 1970-01-01 00:00:00 +0000
+++ _bootstrap/COPYRIGHT.txt 2009-03-24 13:26:45 +0000
@@ -0,0 +1,9 @@
1Copyright (c) 2004-2009 Zope Corporation and Contributors.
2All Rights Reserved.
3
4This software is subject to the provisions of the Zope Public License,
5Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
6THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
7WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
8WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
9FOR A PARTICULAR PURPOSE.
010
=== added file '_bootstrap/LICENSE.txt'
--- _bootstrap/LICENSE.txt 1970-01-01 00:00:00 +0000
+++ _bootstrap/LICENSE.txt 2009-03-24 13:26:45 +0000
@@ -0,0 +1,54 @@
1Zope Public License (ZPL) Version 2.1
2-------------------------------------
3
4A copyright notice accompanies this license document that
5identifies the copyright holders.
6
7This license has been certified as open source. It has also
8been designated as GPL compatible by the Free Software
9Foundation (FSF).
10
11Redistribution and use in source and binary forms, with or
12without modification, are permitted provided that the
13following conditions are met:
14
151. Redistributions in source code must retain the
16 accompanying copyright notice, this list of conditions,
17 and the following disclaimer.
18
192. Redistributions in binary form must reproduce the accompanying
20 copyright notice, this list of conditions, and the
21 following disclaimer in the documentation and/or other
22 materials provided with the distribution.
23
243. Names of the copyright holders must not be used to
25 endorse or promote products derived from this software
26 without prior written permission from the copyright
27 holders.
28
294. The right to distribute this software or to use it for
30 any purpose does not give you the right to use
31 Servicemarks (sm) or Trademarks (tm) of the copyright
32 holders. Use of them is covered by separate agreement
33 with the copyright holders.
34
355. If any files are modified, you must cause the modified
36 files to carry prominent notices stating that you changed
37 the files and the date of any change.
38
39Disclaimer
40
41 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS''
42 AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
43 NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
44 AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
45 NO EVENT SHALL THE COPYRIGHT HOLDERS BE
46 LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
47 EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
48 LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
49 LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
50 HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
51 CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
52 OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
53 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
54 DAMAGE.
0\ No newline at end of file55\ No newline at end of file
156
=== renamed file 'bootstrap.py' => '_bootstrap/bootstrap.py'
=== added symlink 'bootstrap.py'
=== target is '_bootstrap/bootstrap.py'
=== modified file 'buildout.cfg'
--- buildout.cfg 2009-03-19 15:22:56 +0000
+++ buildout.cfg 2009-03-23 22:48:16 +0000
@@ -1,7 +1,7 @@
1[buildout]1[buildout]
2parts =2parts =
3 interpreter3 interpreter
4# test4 test
5# docs5# docs
6 tags6 tags
7unzip = true7unzip = true
88
=== modified file 'setup.py'
--- setup.py 2009-03-20 20:46:06 +0000
+++ setup.py 2009-03-23 22:48:16 +0000
@@ -74,5 +74,5 @@
74 "Operating System :: OS Independent",74 "Operating System :: OS Independent",
75 "Programming Language :: Python"],75 "Programming Language :: Python"],
76 setup_requires=['eggtestinfo', 'setuptools_bzr'],76 setup_requires=['eggtestinfo', 'setuptools_bzr'],
77 # test_suite='launchpadlib.tests.test_suite',77 test_suite='launchpadlib.tests',
78 )78 )
7979
=== modified file 'src/launchpadlib/NEWS.txt'
--- src/launchpadlib/NEWS.txt 2009-03-21 11:39:22 +0000
+++ src/launchpadlib/NEWS.txt 2009-03-24 13:31:09 +0000
@@ -2,7 +2,7 @@
2NEWS for launchpadlib2NEWS for launchpadlib
3=====================3=====================
44
51.0 (2009-03-23)51.0 (2009-03-24)
6================6================
77
8- Initial release on PyPI8- Initial release on PyPI
99
=== modified file 'src/launchpadlib/tests/__init__.py'
--- src/launchpadlib/tests/__init__.py 2009-02-25 09:34:02 +0000
+++ src/launchpadlib/tests/__init__.py 2009-03-23 22:48:16 +0000
@@ -0,0 +1,16 @@
1# Copyright 2008 Canonical Ltd.
2
3# This file is part of launchpadlib.
4#
5# launchpadlib is free software: you can redistribute it and/or modify it
6# under the terms of the GNU Lesser General Public License as published by the
7# Free Software Foundation, version 3 of the License.
8#
9# launchpadlib is distributed in the hope that it will be useful, but WITHOUT
10# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
12# for more details.
13#
14# You should have received a copy of the GNU Lesser General Public License
15# along with launchpadlib. If not, see <http://www.gnu.org/licenses/>.
16"""Tests for launchpadlib"""
017
=== modified file 'src/launchpadlib/tests/test_credentials.py'
--- src/launchpadlib/tests/test_credentials.py 2009-02-26 14:04:42 +0000
+++ src/launchpadlib/tests/test_credentials.py 2009-03-23 22:48:16 +0000
@@ -2,19 +2,17 @@
22
3# This file is part of launchpadlib.3# This file is part of launchpadlib.
4#4#
5# launchpadlib is free software: you can redistribute it and/or modify5# launchpadlib is free software: you can redistribute it and/or modify it
6# it under the terms of the GNU Lesser General Public License as6# under the terms of the GNU Lesser General Public License as published by the
7# published by the Free Software Foundation, either version 3 of the7# Free Software Foundation, version 3 of the License.
8# License, or (at your option) any later version.8#
9#9# launchpadlib is distributed in the hope that it will be useful, but WITHOUT
10# launchpadlib is distributed in the hope that it will be useful, but10# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11# WITHOUT ANY WARRANTY; without even the implied warranty of11# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
12# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU12# for more details.
13# Lesser General Public License for more details.13#
14#14# You should have received a copy of the GNU Lesser General Public License
15# You should have received a copy of the GNU Lesser General Public15# along with launchpadlib. If not, see <http://www.gnu.org/licenses/>.
16# License along with launchpadlib. If not, see
17# <http://www.gnu.org/licenses/>.
1816
19"""Tests for the Credentials class."""17"""Tests for the Credentials class."""
2018
@@ -57,3 +55,6 @@
57 loaded_credentials.access_token.key, 'access.key')55 loaded_credentials.access_token.key, 'access.key')
58 self.assertEqual(56 self.assertEqual(
59 loaded_credentials.access_token.secret, 'access.secret')57 loaded_credentials.access_token.secret, 'access.secret')
58
59def additional_tests():
60 return unittest.TestLoader().loadTestsFromName(__name__)
6061
=== modified file 'src/launchpadlib/tests/test_launchpad.py'
--- src/launchpadlib/tests/test_launchpad.py 2009-03-12 14:17:55 +0000
+++ src/launchpadlib/tests/test_launchpad.py 2009-03-23 22:48:16 +0000
@@ -2,19 +2,17 @@
22
3# This file is part of launchpadlib.3# This file is part of launchpadlib.
4#4#
5# launchpadlib is free software: you can redistribute it and/or modify5# launchpadlib is free software: you can redistribute it and/or modify it
6# it under the terms of the GNU Lesser General Public License as6# under the terms of the GNU Lesser General Public License as published by the
7# published by the Free Software Foundation, either version 3 of the7# Free Software Foundation, version 3 of the License.
8# License, or (at your option) any later version.8#
9#9# launchpadlib is distributed in the hope that it will be useful, but WITHOUT
10# launchpadlib is distributed in the hope that it will be useful, but10# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11# WITHOUT ANY WARRANTY; without even the implied warranty of11# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
12# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU12# for more details.
13# Lesser General Public License for more details.13#
14#14# You should have received a copy of the GNU Lesser General Public License
15# You should have received a copy of the GNU Lesser General Public15# along with launchpadlib. If not, see <http://www.gnu.org/licenses/>.
16# License along with launchpadlib. If not, see
17# <http://www.gnu.org/licenses/>.
1816
19"""Tests for the Launchpad class."""17"""Tests for the Launchpad class."""
2018
@@ -205,3 +203,6 @@
205 os.path.join(launchpadlib_dir, 'api.example.com', 'cache')))203 os.path.join(launchpadlib_dir, 'api.example.com', 'cache')))
206 self.assertTrue(os.path.exists(204 self.assertTrue(os.path.exists(
207 os.path.join(launchpadlib_dir, 'api.example.com', 'credentials')))205 os.path.join(launchpadlib_dir, 'api.example.com', 'credentials')))
206
207def additional_tests():
208 return unittest.TestLoader().loadTestsFromName(__name__)

Subscribers

People subscribed via source and target branches