Handle directory changes in a context manager

Author: nateprewitt

scripts/ci/run-crt-tests

@@ -5,12 +5,23 @@
 
 import os
 import sys
+from contextlib import contextmanager
 from subprocess import check_call
 
 _dname = os.path.dirname
 
 REPO_ROOT = _dname(_dname(_dname(os.path.abspath(__file__))))
-os.chdir(os.path.join(REPO_ROOT, "tests"))
+
+
+@contextmanager
+def cd(path):
+    """Change directory while inside context manager."""
+    cwd = os.getcwd()
+    try:
+        os.chdir(path)
+        yield
+    finally:
+        os.chdir(cwd)
 
 
 def run(command):
@@ -23,4 +34,6 @@ except ImportError:
     print("MISSING DEPENDENCY: awscrt must be installed to run the crt tests.")
     sys.exit(1)
 
-run(f'{REPO_ROOT}/scripts/ci/run-tests unit/ functional/')
+if __name__ == "__main__":
+    with cd(os.path.join(REPO_ROOT, "tests")):
+        run(f"{REPO_ROOT}/scripts/ci/run-tests unit/ functional/")

scripts/ci/run-integ-tests

@@ -4,16 +4,29 @@
 # binary package not from the CWD.
 
 import os
+from contextlib import contextmanager
 from subprocess import check_call
 
 _dname = os.path.dirname
 
 REPO_ROOT = _dname(_dname(_dname(os.path.abspath(__file__))))
-os.chdir(os.path.join(REPO_ROOT, "tests"))
+
+
+@contextmanager
+def cd(path):
+    """Change directory while inside context manager."""
+    cwd = os.getcwd()
+    try:
+        os.chdir(path)
+        yield
+    finally:
+        os.chdir(cwd)
 
 
 def run(command):
     return check_call(command, shell=True)
 
 
-run(f"{REPO_ROOT}/scripts/ci/run-tests --with-cov integration")
+if __name__ == "__main__":
+    with cd(os.path.join(REPO_ROOT, "tests")):
+        run(f"{REPO_ROOT}/scripts/ci/run-tests --with-cov integration")

scripts/ci/run-tests

@@ -5,13 +5,24 @@
 
 import argparse
 import os
+from contextlib import contextmanager
 from subprocess import check_call
 
 _dname = os.path.dirname
 
 REPO_ROOT = _dname(_dname(_dname(os.path.abspath(__file__))))
 PACKAGE = "boto3"
-os.chdir(os.path.join(REPO_ROOT, "tests"))
+
+
+@contextmanager
+def cd(path):
+    """Change directory while inside context manager."""
+    cwd = os.getcwd()
+    try:
+        os.chdir(path)
+        yield
+    finally:
+        os.chdir(cwd)
 
 
 def run(command):
@@ -20,7 +31,7 @@ def run(command):
 
 def process_args(args):
     runner = args.test_runner
-    test_args = ''
+    test_args = ""
     if args.with_cov:
         test_args += (
             f"--with-xunit --cover-erase --with-coverage "
@@ -57,4 +68,5 @@ if __name__ == "__main__":
 
     cmd = f"{test_runner} {test_args}{test_dirs}"
     print(f"Running {cmd}...")
-    run(cmd)
+    with cd(os.path.join(REPO_ROOT, "tests")):
+        run(cmd)