Use pushd from twitter.common.contextutil.

.gitignore

@@ -8,5 +8,6 @@ atlassian-ide-plugin.xml
 venv*/
 build
 tests/fixture/package/dist
+dist/
 
 README.html

tests/test_client.py

@@ -1,22 +1,11 @@
-import os
-from contextlib import contextmanager
+import requests
+from twitter.common.contextutil import pushd
 from unittest import TestCase
 
-import requests
 from devpi_plumber.client import DevpiClientError, volatile_index
 from devpi_plumber.server import TestServer
 
 
-@contextmanager
-def cd(path):
-    old_dir = os.getcwd()
-    os.chdir(path)
-    try:
-        yield
-    finally:
-        os.chdir(old_dir)
-
-
 class ClientTest(TestCase):
     """
     Assert that the plumber devpi client behaves as expected.
@@ -139,7 +128,7 @@ def test_upload_with_docs(self):
         with TestServer(users, indices) as devpi:
             devpi.login("user", "secret")
             devpi.use("user/index")
-            with cd('tests/fixture/package'):
+            with pushd('tests/fixture/package'):
                 devpi.upload(with_docs=True)
 
     def test_list_existing_package(self):