Merge lp:~jderose/microfiber/package into lp:microfiber

[Jason Gerard DeRose]

For details, see this bug:

https://bugs.launchpad.net/microfiber/+bug/1131007

Changes include:

* Moved microfiber.py to microfiber/__init__.py

* Moved test_microfiber.py to microfiber/tests/__init__.py

* Added microfiber.tests.run callable module

* Change `setup.py test` to use microfiber.tests.run.run_tests()

* setup.py now installs both the microfiber and microfiber.tests packages

* For fun, in benchmark use time.perf_counter() available in Python 3.3

[sarasfox (kevin-cloinger)]

Nice I like the idea of moving the test new file. I don't see any thing ugly up out you got my thumbs up.

review: Approve

[Jason Gerard DeRose (jderose)]

Thanks!

[xzcvczx (xzcvczx)]

Looks good

review: Approve (master)

=== modified file '.bzrignore'
--- .bzrignore	2011-09-01 10:13:07 +0000
+++ .bzrignore	2013-02-21 02:50:28 +0000
@@ -1,2 +1,2 @@
-__pycache__
-doc/_build/*
+build/
+doc/_build/

=== modified file 'MANIFEST.in'
--- MANIFEST.in	2011-09-23 20:45:13 +0000
+++ MANIFEST.in	2013-02-21 02:50:28 +0000
@@ -1,3 +1,2 @@
 include COPYING COPYING.LESSER
-include test_microfiber.py
 include doc/*

=== modified file 'benchmark_microfiber.py'
--- benchmark_microfiber.py	2012-09-04 17:31:57 +0000
+++ benchmark_microfiber.py	2013-02-21 02:50:28 +0000
@@ -70,31 +70,31 @@
 )
 
 print('  Saving {} documents in db {!r}...'.format(count, name))
-start = time.time()
+start = time.perf_counter()
 for _id in ids:
     doc = dict(master)
     doc['_id'] = _id
     db.save(doc)
     docs.append(doc)
-elapsed = time.time() - start
+elapsed = time.perf_counter() - start
 total += elapsed
 print('    Seconds: {:.2f}'.format(elapsed))
 print('    Saves per second: {:.1f}'.format(count / elapsed))
 
 print('  Getting {} documents from db {!r}...'.format(count, name))
-start = time.time()
+start = time.perf_counter()
 for _id in ids:
     db.get(_id)
-elapsed = time.time() - start
+elapsed = time.perf_counter() - start
 total += elapsed
 print('    Seconds: {:.2f}'.format(elapsed))
 print('    Gets per second: {:.1f}'.format(count / elapsed))
 
 print('  Deleting {} documents from db {!r}...'.format(count, name))
-start = time.time()
+start = time.perf_counter()
 for doc in docs:
     db.delete(doc['_id'], rev=doc['_rev'])
-elapsed = time.time() - start
+elapsed = time.perf_counter() - start
 total += elapsed
 print('    Seconds: {:.2f}'.format(elapsed))
 print('    Deletes per second: {:.1f}'.format(count / elapsed))

=== added directory 'microfiber'
=== renamed file 'microfiber.py' => 'microfiber/__init__.py'
=== added directory 'microfiber/tests'
=== renamed file 'test_microfiber.py' => 'microfiber/tests/__init__.py'
=== added file 'microfiber/tests/run.py'
--- microfiber/tests/run.py	1970-01-01 00:00:00 +0000
+++ microfiber/tests/run.py	2013-02-21 02:50:28 +0000
@@ -0,0 +1,68 @@
+# microfiber: fabric for a lightweight Couch
+# Copyright (C) 2013 Novacut Inc
+#
+# This file is part of `microfiber`.
+#
+# `microfiber` 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.
+#
+# `microfiber` 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 `microfiber`.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Authors:
+#   Jason Gerard DeRose <[e-mail]>
+#
+
+"""
+Run the `microfiber` unit tests.
+
+From the command line, run like this::
+
+    $ python3 -m microfiber.tests.run
+"""
+
+import sys
+from os import path
+from unittest import TestLoader, TextTestRunner
+from doctest import DocTestSuite
+
+import microfiber
+
+
+pynames = (
+    'microfiber',
+    'microfiber.tests',
+)
+
+
+def run_tests():
+    # Add unit-tests:
+    loader = TestLoader()
+    suite = loader.loadTestsFromNames(pynames)
+
+    # Add doc-tests:
+    for name in pynames:
+        suite.addTest(DocTestSuite(name))
+
+    # Run the tests:
+    runner = TextTestRunner(verbosity=2)
+    result = runner.run(suite)
+    success =  result.wasSuccessful()
+    print(
+        'microfiber: {!r}'.format(path.abspath(microfiber.__file__)),
+        file=sys.stderr
+    )
+    print('-' * 70, file=sys.stderr)
+    return result.wasSuccessful()
+
+
+if __name__ == '__main__':
+    if not run_tests():
+        raise SystemExit('2')

=== modified file 'setup.py'
--- setup.py	2013-02-12 08:33:52 +0000
+++ setup.py	2013-02-21 02:50:28 +0000
@@ -35,11 +35,10 @@
 
 from distutils.core import setup
 from distutils.cmd import Command
-from unittest import TestLoader, TextTestRunner
-from doctest import DocTestSuite
 import os
 
 import microfiber
+from microfiber.tests.run import run_tests
 
 
 class Test(Command):
@@ -58,27 +57,12 @@
         pass
 
     def run(self):
-        # Possibly set environ variables for live test:
         if self.no_live:
             os.environ['MICROFIBER_TEST_NO_LIVE'] = 'true'
         if self.skip_slow:
             os.environ['MICROFIBER_TEST_SKIP_SLOW'] = 'true'
-
-        pynames = ['microfiber', 'test_microfiber']
-
-        # Add unit-tests:
-        loader = TestLoader()
-        suite = loader.loadTestsFromNames(pynames)
-
-        # Add doc-tests:
-        for name in pynames:
-            suite.addTest(DocTestSuite(name))
-
-        # Run the tests:
-        runner = TextTestRunner(verbosity=2)
-        result = runner.run(suite)
-        if not result.wasSuccessful():
-            raise SystemExit(2)
+        if not run_tests():
+            raise SystemExit('2')
 
 
 setup(
@@ -89,6 +73,6 @@
     author='Jason Gerard DeRose',
     author_email='[e-mail]',
     license='LGPLv3+',
-    py_modules=['microfiber'],
+    packages=['microfiber', 'microfiber.tests'],
     cmdclass={'test': Test},
 )