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

[Gary Poster]

[Gary Poster (gary)]

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.

[Francis J. Lacoste (flacoste)]

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

=== 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 @@
+exclude MANIFEST.in buildout.cfg bootstrap.py .bzrignore
+prune _bootstrap

=== 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 @@
 Please submit bug reports to
 
     https://bugs.launchpad.net/launchpadlib
-
-
-== Tests ==
-
-launchpadlib's test suite can be run using the nose test runner. It
-should work simply running 'nosetests' from the directory where this
-README file is located.

=== 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 @@
+Copyright (c) 2004-2009 Zope Corporation and Contributors.
+All Rights Reserved.
+
+This software is subject to the provisions of the Zope Public License,
+Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
+THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+FOR A PARTICULAR PURPOSE.

=== 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 @@
+Zope Public License (ZPL) Version 2.1
+-------------------------------------
+
+A copyright notice accompanies this license document that
+identifies the copyright holders.
+
+This license has been certified as open source. It has also
+been designated as GPL compatible by the Free Software
+Foundation (FSF).
+
+Redistribution and use in source and binary forms, with or
+without modification, are permitted provided that the
+following conditions are met:
+
+1. Redistributions in source code must retain the
+   accompanying copyright notice, this list of conditions,
+   and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the accompanying
+   copyright notice, this list of conditions, and the
+   following disclaimer in the documentation and/or other
+   materials provided with the distribution.
+
+3. Names of the copyright holders must not be used to
+   endorse or promote products derived from this software
+   without prior written permission from the copyright
+   holders.
+
+4. The right to distribute this software or to use it for
+   any purpose does not give you the right to use
+   Servicemarks (sm) or Trademarks (tm) of the copyright
+   holders. Use of them is covered by separate agreement
+   with the copyright holders.
+
+5. If any files are modified, you must cause the modified
+   files to carry prominent notices stating that you changed
+   the files and the date of any change.
+
+Disclaimer
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS''
+  AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
+  NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+  AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
+  NO EVENT SHALL THE COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+  HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+  OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+  DAMAGE.
\ No newline at end of file

=== 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 @@
 [buildout]
 parts =
     interpreter
-#    test
+    test
 #    docs
     tags
 unzip = true

=== 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 @@
         "Operating System :: OS Independent",
         "Programming Language :: Python"],
     setup_requires=['eggtestinfo', 'setuptools_bzr'],
-    # test_suite='launchpadlib.tests.test_suite',
+    test_suite='launchpadlib.tests',
     )

=== 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 @@
 NEWS for launchpadlib
 =====================
 
-1.0 (2009-03-23)
+1.0 (2009-03-24)
 ================
 
 - Initial release on PyPI

=== 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 @@
+# Copyright 2008 Canonical Ltd.
+
+# This file is part of launchpadlib.
+#
+# launchpadlib is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by the
+# Free Software Foundation, version 3 of the License.
+#
+# launchpadlib is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+# for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with launchpadlib. If not, see <http://www.gnu.org/licenses/>.
+"""Tests for launchpadlib"""

=== 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 @@
 
 # This file is part of launchpadlib.
 #
-# launchpadlib is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# launchpadlib is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with launchpadlib.  If not, see
-# <http://www.gnu.org/licenses/>.
+# launchpadlib is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by the
+# Free Software Foundation, version 3 of the License.
+#
+# launchpadlib is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+# for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with launchpadlib. If not, see <http://www.gnu.org/licenses/>.
 
 """Tests for the Credentials class."""
 
@@ -57,3 +55,6 @@
             loaded_credentials.access_token.key, 'access.key')
         self.assertEqual(
             loaded_credentials.access_token.secret, 'access.secret')
+
+def additional_tests():
+    return unittest.TestLoader().loadTestsFromName(__name__)

=== 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 @@
 
 # This file is part of launchpadlib.
 #
-# launchpadlib is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# launchpadlib is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with launchpadlib.  If not, see
-# <http://www.gnu.org/licenses/>.
+# launchpadlib is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by the
+# Free Software Foundation, version 3 of the License.
+#
+# launchpadlib is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+# for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with launchpadlib. If not, see <http://www.gnu.org/licenses/>.
 
 """Tests for the Launchpad class."""
 
@@ -205,3 +203,6 @@
             os.path.join(launchpadlib_dir, 'api.example.com', 'cache')))
         self.assertTrue(os.path.exists(
             os.path.join(launchpadlib_dir, 'api.example.com', 'credentials')))
+
+def additional_tests():
+    return unittest.TestLoader().loadTestsFromName(__name__)