Merge pull request #62 from zalando-incubator/issue-61

locust_taskset: take Task2 into account when checking for Task
zalando-incubator · Sep 2, 2019 · b65b0ad · b65b0ad
2 parents fd56541 + 484d427
commit b65b0ad
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 4 deletions.
diff --git a/docs/Changelog.rst b/docs/Changelog.rst
@@ -15,6 +15,25 @@ The format is based on `Keep a Changelog`_, and this project adheres to
    :local:
    :depth: 1
 
+.. _v1.2.5:
+
+v1.2.5
+======
+
+- Release date: 2019-09-02 12:00
+
+- Diff__.
+
+__ https://github.com/zalando-incubator/transformer/compare/v1.2.4...v1.2.5
+
+Fixed
+-----
+
+The generated scenario classes always inherit from
+:class:`~locust.TaskSequence` (instead of a :class:`~locust.TaskSet`) when they
+use the `@seq_task` decorator.
+Thank you :user:`kbrowns` for reporting this! (:pr:`62`)
+
 .. _v1.2.4:
 
 v1.2.4

diff --git a/docs/Creating-HAR-files.rst b/docs/Creating-HAR-files.rst
@@ -27,7 +27,7 @@ Record a scenario
 -----------------
 
 #. **Prepare your scenario** by thinking through the steps you want to execute.
-#. Open Chrome in either **Gest** or **Incognito** mode (it's important to have
+#. Open Chrome in either **Guest** or **Incognito** mode (it's important to have
    no cookies prior to starting).
 #. Open the `Developer Tools`_.
 #. Open the **Network** panel.

diff --git a/docs/conf.py b/docs/conf.py
@@ -25,7 +25,7 @@
 # The short X.Y version
 version = "1.2"
 # The full version, including alpha/beta/rc tags
-release = "1.2.4"
+release = "1.2.5"
 
 
 # -- General configuration ---------------------------------------------------

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "har-transformer"
-version = "1.2.4"
+version = "1.2.5"
 description = "A tool to convert HAR files into a locustfile."
 authors = [
     "Serhii Cherniavskyi <[email protected]>",

diff --git a/transformer/locust.py b/transformer/locust.py
@@ -45,7 +45,7 @@ def locust_taskset(scenario: Scenario) -> py.Class:
     Transforms a scenario (potentially containing other scenarios) into a Locust
     TaskSet definition.
     """
-    if any(isinstance(child, Task) for child in scenario.children):
+    if any(isinstance(child, (Task, Task2)) for child in scenario.children):
         ts_type = TaskSetType.Sequence
     else:
         ts_type = TaskSetType.Set