From dce8df45d5b86c7b20802ee790a8c6da2ecd55cb Mon Sep 17 00:00:00 2001
From: turturica <Ionut Turturica>
Date: Fri, 24 Aug 2018 15:51:42 -0700
Subject: [PATCH] Added changelog items.

---
 changelog/3796.bugfix.rst | 2 ++
 changelog/3854.bugfix.rst | 1 +
 testing/python/fixture.py | 4 ++--
 3 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 changelog/3796.bugfix.rst
 create mode 100644 changelog/3854.bugfix.rst

diff --git a/changelog/3796.bugfix.rst b/changelog/3796.bugfix.rst
new file mode 100644
index 000000000..bc590815f
--- /dev/null
+++ b/changelog/3796.bugfix.rst
@@ -0,0 +1,2 @@
+Fixed an issue where teardown of fixtures of consecutive sub-packages were executed once, at the end of the outer
+package.
\ No newline at end of file
diff --git a/changelog/3854.bugfix.rst b/changelog/3854.bugfix.rst
new file mode 100644
index 000000000..72af08aba
--- /dev/null
+++ b/changelog/3854.bugfix.rst
@@ -0,0 +1 @@
+Fixes double collection of tests within packages when the filename starts with a capital letter.
\ No newline at end of file
diff --git a/testing/python/fixture.py b/testing/python/fixture.py
index 47503b340..f8f5eb54e 100644
--- a/testing/python/fixture.py
+++ b/testing/python/fixture.py
@@ -4007,7 +4007,7 @@ class TestScopeOrdering(object):
             def fix():
                 values.append("pre-sub1")
                 yield values
-                values.pop()
+                assert values.pop() == "pre-sub1"
         """
             )
         )
@@ -4031,7 +4031,7 @@ class TestScopeOrdering(object):
             def fix():
                 values.append("pre-sub2")
                 yield values
-                values.pop()
+                assert values.pop() == "pre-sub2"
         """
             )
         )