Merge pull request #152 from iivanou/handle_exitfirst_correctly

Terminate service correctly with the maxfail option

Author: Dmitriy Gumeniuk

pytest_reportportal/plugin.py

@@ -101,12 +101,14 @@ def pytest_sessionfinish(session):
         # Stop now if the plugin is not properly configured
         return
 
-    # FixMe: currently method of RP api takes the string parameter
-    # so it is hardcoded
+    shouldfail = getattr(session, 'shouldfail', False)
+    nowait = True if shouldfail else False
+
     if is_master(session.config):
-        session.config.py_test_service.finish_launch(status='RP_Launch')
+        session.config.py_test_service.finish_launch(
+            status='RP_Launch', force=nowait)
 
-    session.config.py_test_service.terminate_service()
+    session.config.py_test_service.terminate_service(nowait=nowait)
 
 
 def pytest_configure(config):

pytest_reportportal/service.py

@@ -295,7 +295,7 @@ def finish_pytest_item(self, test_item, status, issue=None):
             log.debug('ReportPortal - End TestSuite: request_body=%s', payload)
             self.RP.finish_test_item(**payload)
 
-    def finish_launch(self, launch=None, status='rp_launch'):
+    def finish_launch(self, status='rp_launch', force=False):
         self._stop_if_necessary()
         if self.RP is None:
             return
@@ -306,7 +306,10 @@ def finish_launch(self, launch=None, status='rp_launch'):
             'status': status
         }
         log.debug('ReportPortal - Finish launch: request_body=%s', fl_rq)
-        self.RP.finish_launch(**fl_rq)
+        if not force:
+            self.RP.finish_launch(**fl_rq)
+        else:
+            self.RP.stop_launch(**fl_rq)
 
     def post_log(self, message, loglevel='INFO', attachment=None):
         self._stop_if_necessary()

setup.py

@@ -8,7 +8,7 @@ def read_file(fname):
         return f.read()
 
 
-version = '1.0.8'
+version = '1.0.9'
 
 
 requirements = [

tests/test_plugin.py

@@ -6,12 +6,12 @@
     from mock import create_autospec, Mock, patch
 
 from _pytest.config import Config
-from  delayed_assert import expect, assert_expectations
+from delayed_assert import expect, assert_expectations
 import pytest
 from requests.exceptions import RequestException
 
 from pytest_reportportal.listener import RPReportListener
-from pytest_reportportal.plugin import pytest_configure
+from pytest_reportportal.plugin import pytest_configure, pytest_sessionfinish
 from pytest_reportportal.service import PyTestServiceClass
 from pytest_reportportal import RPLogger
 
@@ -169,3 +169,27 @@ def iter_markers(name=None):
     expect(test_item.add_marker.call_args[0][0] == "issue:456823",
            "item.add_marker called with incorrect parameters")
     assert_expectations()
+
+
+@patch('pytest_reportportal.plugin.is_master', Mock(return_value=True))
+@pytest.mark.parametrize('shouldfail, outcome', [
+    (False, False), ('stopping after 1 failures', True)
+])
+def test_sessionfinish_with_maxfail(shouldfail, outcome):
+    """Test session_finish logic when the maxfail Pytest argument is in use.
+
+    :param shouldfail: shouldfail attribute value for the Session object
+    :param outcome:    nowait argument value passed to the terminate_service()
+    """
+    mocked_session = Mock()
+    mocked_session.shouldfail = shouldfail
+    mocked_session.config = Mock()
+    mocked_session.config._reportportal_configured = True
+    mocked_session.config.py_test_service.terminate_service = Mock()
+    mocked_session.config.py_test_service.finish_launch = Mock()
+    pytest_sessionfinish(mocked_session)
+    expect(lambda: mocked_session.config.py_test_service.
+        finish_launch.assert_called_with(force=outcome, status='RP_Launch'))
+    expect(lambda: mocked_session.config.py_test_service.
+        terminate_service.assert_called_with(nowait=outcome))
+    assert_expectations()