Merge branch 'master' of https://github.com/certbot/certbot

1 files changed, 7 insertions, 18 deletions

diff --git a/tools/install_and_test.py b/tools/install_and_test.py
index b15c8eca5..192708957 100755
--- a/tools/install_and_test.py
+++ b/tools/install_and_test.py
@@ -8,19 +8,16 @@
 from __future__ import print_function
 
 import os
-import sys
-import tempfile
-import shutil
-import subprocess
 import re
+import subprocess
+import sys
 
-SKIP_PROJECTS_ON_WINDOWS = [
-    'certbot-apache', 'certbot-nginx', 'certbot-postfix', 'letshelp-certbot']
+SKIP_PROJECTS_ON_WINDOWS = ['certbot-apache', 'letshelp-certbot']
 
 
-def call_with_print(command, cwd=None):
+def call_with_print(command):
     print(command)
-    subprocess.check_call(command, shell=True, cwd=cwd or os.getcwd())
+    subprocess.check_call(command, shell=True)
 
 
 def main(args):
@@ -42,16 +39,8 @@ def main(args):
         call_with_print(' '.join(current_command))
         pkg = re.sub(r'\[\w+\]', '', requirement)
 
-        if pkg == '.':
-            pkg = 'certbot'
-
-        temp_cwd = tempfile.mkdtemp()
-        shutil.copy2("pytest.ini", temp_cwd)
-        try:
-            call_with_print(' '.join([
-                sys.executable, '-m', 'pytest', '--pyargs', pkg.replace('-', '_')]), cwd=temp_cwd)
-        finally:
-            shutil.rmtree(temp_cwd)
+        call_with_print(' '.join([
+            sys.executable, '-m', 'pytest', pkg]))
 
 if __name__ == '__main__':
     main(sys.argv[1:])