fix and test env var passing between fixtures and tests

Uberspace · Jul 16, 2024 · a1fd088 · a1fd088
1 parent 5dea76a
commit a1fd088
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/src/shellinspector/runner.py b/src/shellinspector/runner.py
@@ -460,7 +460,7 @@ def run(self, specfile: Specfile, outer_used_sessions=None):
                 self.run(specfile.fixture_specfile_post, used_sessions)
 
         finally:
-            if not outer_used_sessions:
+            if outer_used_sessions is None:
                 for session in used_sessions:
                     session.pop_state()
 

diff --git a/tests/e2e/900_fixtures.ispec b/tests/e2e/900_fixtures.ispec
@@ -4,5 +4,7 @@ settings:
   fixture_dirs:
     - fixtures
 ---
-%~ id create_user
+% echo $USRNAME
+create_user
+%~ id $USRNAME
 create_user
diff --git a/tests/e2e/fixtures/create_user_pre.ispec b/tests/e2e/fixtures/create_user_pre.ispec
@@ -1 +1,2 @@
-% adduser -D create_user
+% export USRNAME=create_user
+% adduser -D $USRNAME
diff --git a/tests/test_parser.py b/tests/test_parser.py
@@ -582,6 +582,6 @@ def test_fixture():
     assert specfile.fixture == "e2e/fixtures/create_user"
     assert not specfile.errors, specfile.errors
     assert specfile.fixture_specfile_pre
-    assert len(specfile.fixture_specfile_pre.commands) == 1
+    assert len(specfile.fixture_specfile_pre.commands) == 2
     assert specfile.fixture_specfile_post
     assert len(specfile.fixture_specfile_post.commands) == 1