Merge lp:~james-w/requestsplus/fix-maybe-timeline into lp:requestsplus

[James Westby]

Fix maybe_timeline for the case where the factory returns None.

[Ricardo Kirkner (ricardokirkner)]

LGTM

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~james-w/requestsplus/fix-maybe-timeline into lp:requestsplus failed. Below is the output from the failed tests.

virtualenv virtualenv
New python executable in virtualenv/bin/python
Installing setuptools, pip...done.
virtualenv/bin/pip install -r requirements.txt
Downloading/unpacking fixtures (from -r requirements.txt (line 1))
  Running setup.py (path:/mnt/tarmac/cache/requestsplus/trunk/virtualenv/build/fixtures/setup.py) egg_info for package fixtures

    Installed /mnt/tarmac/cache/requestsplus/trunk/virtualenv/build/fixtures/pbr-0.10.0-py2.7.egg
    [pbr] Processing SOURCES.txt
    warning: LocalManifestMaker: standard file '-c' not found

    warning: no previously-included files found matching '.gitignore'
    warning: no previously-included files found matching '.gitreview'
    warning: no previously-included files matching '*.pyc' found anywhere in distribution
Downloading/unpacking pyflakes (from -r requirements.txt (line 2))
  Downloading pyflakes-0.8.1-py2.py3-none-any.whl
Downloading/unpacking pep8 (from -r requirements.txt (line 3))
  Downloading pep8-1.5.7-py2.py3-none-any.whl
Downloading/unpacking requests (from -r requirements.txt (line 4))
Downloading/unpacking responses (from -r requirements.txt (line 5))
  Downloading responses-0.3.0.tar.gz
  Running setup.py (path:/mnt/tarmac/cache/requestsplus/trunk/virtualenv/build/responses/setup.py) egg_info for package responses

Downloading/unpacking testtools (from -r requirements.txt (line 6))
  Running setup.py (path:/mnt/tarmac/cache/requestsplus/trunk/virtualenv/build/testtools/setup.py) egg_info for package testtools

    no previously-included directories found matching 'doc/_build'
Downloading/unpacking timeline (from -r requirements.txt (line 7))
  Downloading timeline-0.0.4.tar.gz
  Running setup.py (path:/mnt/tarmac/cache/requestsplus/trunk/virtualenv/build/timeline/setup.py) egg_info for package timeline

Downloading/unpacking mock (from responses->-r requirements.txt (line 5))
  Running setup.py (path:/mnt/tarmac/cache/requestsplus/trunk/virtualenv/build/mock/setup.py) egg_info for package mock

    warning: no files found matching '*.png' under directory 'docs'
    warning: no files found matching '*.css' under directory 'docs'
    warning: no files found matching '*.html' under directory 'docs'
    warning: no files found matching '*.js' under directory 'docs'
Downloading/unpacking six (from responses->-r requirements.txt (line 5))
  Downloading six-1.8.0-py2.py3-none-any.whl
Downloading/unpacking extras (from testtools->-r requirements.txt (line 6))
  Downloading extras-0.0.3.tar.gz
  Running setup.py (path:/mnt/tarmac/cache/requestsplus/trunk/virtualenv/build/extras/setup.py) egg_info for package extras

Downloading/unpacking python-mimeparse (from testtools->-r requirements.txt (line 6))
  Downloading python-mimeparse-0.1.4.tar.gz
  Running setup.py (path:/mnt/tarmac/cache/requestsplus/trunk/virtualenv/build/python-mimeparse/setup.py) egg_info for package python-mimeparse

Downloading/unpacking pytz (from timeline->-r requirements.txt (line 7))
  Running setup.py (path:/mnt/tarmac/cache/requestsplus/trunk/vi...

[lp:~james-w/requestsplus/fix-maybe-timeline]

13. By James Westby on 2014-10-24

Fix lint.

=== modified file 'Makefile'
--- Makefile	2014-10-22 22:18:38 +0000
+++ Makefile	2014-10-24 15:40:33 +0000
@@ -16,4 +16,6 @@
 	$(BIN)/pyflakes requestsplus
 	$(BIN)/pep8 requestsplus
 
-.PHONY: deps test
+check: lint test
+
+.PHONY: deps test lint check
 
=== modified file 'requestsplus/__init__.py'
--- requestsplus/__init__.py	2014-10-24 13:47:18 +0000
+++ requestsplus/__init__.py	2014-10-24 15:40:33 +0000
@@ -110,8 +110,8 @@
 
 @contextmanager
 def maybe_timeline(factory, category, detail):
-    if factory is not None:
-        timeline = factory()
+    timeline = factory() if factory is not None else None
+    if timeline is not None:
         action = timeline.start(category, detail)
         try:
             yield action
 
=== modified file 'requestsplus/tests/__init__.py'
--- requestsplus/tests/__init__.py	2014-10-24 13:47:18 +0000
+++ requestsplus/tests/__init__.py	2014-10-24 15:40:33 +0000
@@ -16,6 +16,7 @@
     get_extra_details,
     get_oops_ids,
     get_request_id,
+    maybe_timeline,
     record_stats,
     Session,
 )
@@ -302,3 +303,29 @@
         with responses:
             s.get(url)
         self.assertEqual(4, len(statsd.timings))
+
+
+class MaybeTimelineTests(TestCase):
+
+    def test_no_factory(self):
+        with maybe_timeline(None, 'a', 'b') as action:
+            self.assertIs(None, action)
+
+    def test_no_timeline(self):
+        def factory():
+            return None
+        with maybe_timeline(factory, 'a', 'b') as action:
+            self.assertIs(None, action)
+
+    def test_with_timeline(self):
+        timeline = Timeline()
+
+        def factory():
+            return timeline
+
+        with maybe_timeline(factory, 'a', 'b') as action:
+            self.assertIsNot(None, action)
+        self.assertEqual(1, len(timeline.actions))
+        action = timeline.actions[0]
+        self.assertEqual('a', action.category)
+        self.assertEqual('b', action.detail)