From d2d7ac3d1c486bc8380f29b07a7bd5b75df028ba Mon Sep 17 00:00:00 2001 From: Chris Church Date: Thu, 5 Jun 2014 16:02:32 -0400 Subject: [PATCH] Save/restore current directory for each test. --- awx/main/tests/base.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/awx/main/tests/base.py b/awx/main/tests/base.py index 9617110f69..9f2d2c8d7e 100644 --- a/awx/main/tests/base.py +++ b/awx/main/tests/base.py @@ -46,6 +46,8 @@ class BaseTestMixin(object): # Wrap settings so we can redefine them within each test. self._wrapped = settings._wrapped settings._wrapped = UserSettingsHolder(settings._wrapped) + # Capture current directory, change back after each test. + self._cwd = os.getcwd() # Set all AUTH_LDAP_* settings to defaults to avoid using LDAP for # tests unless expicitly configured. for name, value in LDAPSettings.defaults.items(): @@ -90,6 +92,8 @@ class BaseTestMixin(object): os.remove(project_dir) # Restore previous settings after each test. settings._wrapped = self._wrapped + # Restore current directory after each test. + os.chdir(self._cwd) def assertElapsedLessThan(self, seconds): elapsed = time.time() - self._start_time