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

[Jason Gerard DeRose]

This merge:

 * Changes the LiveTestCase base class so it automatically runs the live tests when `usercouch` is available

 * Each live test is now run with a throw-away CouchDB started with `usercouch.misc.TempCouch`

 * Revamps the setup.py test options: --no-live will skip the lives tests even when `usercouch` is available, and --oauth will setup the TempCouch instances with oauth so the internal oauth 1a support gets tested

[Jason Gerard DeRose (jderose)]

I'm going to push this through so I can further verify that we can run live CouchDB tests okay on the build servers.

review: Approve

=== modified file 'debian/control'
--- debian/control	2011-09-30 06:27:17 +0000
+++ debian/control	2011-10-03 18:29:23 +0000
@@ -2,7 +2,9 @@
 Section: python
 Priority: optional
 Maintainer: Jason Gerard DeRose <[e-mail]>
-Build-Depends: debhelper (>= 8.9), python3 (>= 3.2), python-sphinx
+Build-Depends: debhelper (>= 8.9), python3 (>= 3.2),
+    python3-usercouch,
+    python-sphinx,    
 Standards-Version: 3.9.2
 X-Python-Version: 3.2
 X-Python3-Version: 3.2

=== modified file 'setup.py'
--- setup.py	2011-10-03 01:51:09 +0000
+++ setup.py	2011-10-03 18:29:23 +0000
@@ -39,46 +39,28 @@
 import microfiber
 
 
-TEST_DB = 'test_microfiber'
-
-
 class Test(Command):
     description = 'run unit tests and doc tests'
 
     user_options = [
-        ('live', None, 'also run live tests against running CouchDB'),
-        ('dc3', None, 'test with dc3 using `dc3-control GetEnv`'),
-        ('basic', None, 'force dc3 couch tests to use basic auth'),
-        ('url=', None,
-            'live test server URL; default is {!r}'.format(microfiber.SERVER)
-        ),
-        ('db=', None,
-            'live test database name; default is {!r}'.format(TEST_DB)
-        ),
+        ('no-live', None, 'skip live tests against tmp CouchDB instances'),
+        ('oauth', None, 'run live tests using oauth instead of basic auth'),
     ]
 
     def initialize_options(self):
-        self.live = 0
-        self.dc3 = 0
-        self.basic = 0
-        self.url = microfiber.SERVER
-        self.db = TEST_DB
+        self.no_live = 0
+        self.oauth = 0
 
     def finalize_options(self):
-        t = urlparse(self.url)
-        if t.scheme not in ('http', 'https') or t.netloc == '':
-            raise SystemExit('ERROR: invalid url: {!r}'.format(self.url))
+        pass
 
     def run(self):
         # Possibly set environ variables for live test:
-        if self.live or self.dc3:
-            os.environ['MICROFIBER_TEST_DB'] = self.db
-        if self.live:
-            os.environ['MICROFIBER_TEST_URL'] = self.url
-        if self.dc3:
-            os.environ['MICROFIBER_TEST_DC3'] = 'true'
-        if self.basic:
-            os.environ['MICROFIBER_TEST_BASIC_AUTH'] = 'true'
+        if self.no_live:
+            os.environ['MICROFIBER_TEST_NO_LIVE'] = 'true'
+
+        if self.oauth:
+            os.environ['MICROFIBER_TEST_OAUTH'] = 'true'
 
         pynames = ['microfiber', 'test_microfiber']
 

=== modified file 'test_microfiber.py'
--- test_microfiber.py	2011-10-03 01:51:09 +0000
+++ test_microfiber.py	2011-10-03 18:29:23 +0000
@@ -30,7 +30,6 @@
 from base64 import b64encode, b64decode, b32encode, b32decode
 from copy import deepcopy
 import json
-import subprocess
 import time
 import io
 import tempfile
@@ -39,6 +38,11 @@
 from urllib.parse import urlparse, urlencode
 from http.client import HTTPConnection, HTTPSConnection
 
+try:
+    import usercouch.misc
+except ImportError:
+    usercouch = None
+
 import microfiber
 from microfiber import NotFound, MethodNotAllowed, Conflict, PreconditionFailed
 
@@ -481,27 +485,20 @@
 
 
 class LiveTestCase(TestCase):
-
-    def getvar(self, key):
-        try:
-            return os.environ[key]
-        except KeyError:
-            self.skipTest('{} not set'.format(key))
+    db = 'test_microfiber'
 
     def setUp(self):
-        self.db = self.getvar('MICROFIBER_TEST_DB')
-        if os.environ.get('MICROFIBER_TEST_DC3') == 'true':
-            self.env = microfiber.dc3_env()
-            if os.environ.get('MICROFIBER_TEST_BASIC_AUTH') == 'true':
-                # Force use of basic auth even if env['oauth'] exists
-                self.env['oauth'] = None
-        else:
-            self.env = {'url': self.getvar('MICROFIBER_TEST_URL')}
-        cb = microfiber.CouchBase(self.env)
-        try:
-            cb.delete(self.db)
-        except microfiber.NotFound:
-            pass
+        if os.environ.get('MICROFIBER_TEST_NO_LIVE') == 'true':
+            self.skipTest('called with --no-live')
+        if usercouch is None:
+            self.skipTest('`usercouch` not installed')
+        self.oauth = (os.environ.get('MICROFIBER_TEST_OAUTH') == 'true')
+        self.tmpcouch = usercouch.misc.TempCouch()
+        self.env = self.tmpcouch.bootstrap(self.oauth)
+
+    def tearDown(self):
+        self.tmpcouch = None
+        self.env = None
 
 
 class TestCouchBaseLive(LiveTestCase):