test fixes, and add travis ci badge to README

Author: conradho

.travis.yml

@@ -3,6 +3,7 @@ sudo: false
 language: python
 
 python:
+  - 3.5
   - 3.6
   - 3.7
 

README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/pythonanywhere/helper_scripts.svg?branch=master)](https://travis-ci.org/pythonanywhere/helper_scripts)
+
 # PythonAnywhere helper scripts
 
 These scripts are designed to be run from PythonAnywhere consoles

pythonanywhere/virtualenvs.py

@@ -17,10 +17,9 @@ def __eq__(self, other):
 
 
     def create(self, nuke):
-        print(snakesay('Creating virtualenv with Python{python_version}'.format(python_version=self.python_version)))
-        command = 'mkvirtualenv --python=/usr/bin/python{python_version} {domain}'.format(
-            python_version=self.python_version,
-            domain=self.domain,
+        print(snakesay("Creating virtualenv with Python{python_version}".format(python_version=self.python_version)))
+        command = "mkvirtualenv --python=python{python_version} {domain}".format(
+            python_version=self.python_version, domain=self.domain
         )
         if nuke:
             command = 'rmvirtualenv {domain} && {command}'.format(

tests/conftest.py

@@ -48,8 +48,11 @@ def fake_home(local_pip_cache):
 
 @pytest.fixture
 def virtualenvs_folder():
-    actual_virtualenvs = Path('/home/{user}/.virtualenvs'.format(user=getuser()))
-    old_virtualenvs = set(Path(actual_virtualenvs).iterdir())
+    actual_virtualenvs = Path("/home/{user}/.virtualenvs".format(user=getuser()))
+    if actual_virtualenvs.is_dir():
+        old_virtualenvs = set(Path(actual_virtualenvs).iterdir())
+    else:
+        old_virtualenvs = {}
 
     tempdir = _get_temp_dir()
     old_workon = os.environ.get('WORKON_HOME')

tests/test_api.py

@@ -161,9 +161,12 @@ def test_raises_if_post_does_not_20x(self, api_responses, api_token):
 
     def test_raises_if_post_returns_a_200_with_status_error(self, api_responses, api_token):
         expected_post_url = get_api_endpoint().format(username=getpass.getuser(), flavor="webapps")
-        api_responses.add(responses.POST, expected_post_url, status=200, body=json.dumps({
-            "status": "ERROR", "error_type": "bad", "error_message": "bad things happened"
-        }))
+        api_responses.add(
+            responses.POST,
+            expected_post_url,
+            status=200,
+            body=json.dumps({"status": "ERROR", "error_type": "bad", "error_message": "bad things happened"}),
+        )
 
         with pytest.raises(Exception) as e:
             Webapp('mydomain.com').create('2.7', '/virtualenv/path', '/project/path', nuke=False)
@@ -371,18 +374,26 @@ def test_raises_if_delete_does_not_20x(self, api_responses, api_token):
 class TestGetWebappLogs:
 
     def test_get_list_of_logs(self, api_responses, api_token):
-        expected_url = get_api_endpoint().format(
-            username=getpass.getuser(), flavor="files") + "tree/?path=/var/log/"
-        api_responses.add(responses.GET, expected_url, status=200,
-                          body="['/var/log/blah','/var/log/mydomain.com.access.log',\
-                          '/var/log/mydomain.com.access.log.1',\
-                          '/var/log/mydomain.com.access.log.2.gz',\
-                          '/var/log/mydomain.com.error.log',\
-                          '/var/log/mydomain.com.error.log.1',\
-                          '/var/log/mydomain.com.error.log.2.gz',\
-                          '/var/log/mydomain.com.server.log',\
-                          '/var/log/mydomain.com.server.log.1',\
-                          '/var/log/mydomain.com.server.log.2.gz']")
+        expected_url = get_api_endpoint().format(username=getpass.getuser(), flavor="files") + "tree/?path=/var/log/"
+        api_responses.add(
+            responses.GET,
+            expected_url,
+            status=200,
+            body=json.dumps(
+                [
+                    "/var/log/blah",
+                    "/var/log/mydomain.com.access.log",
+                    "/var/log/mydomain.com.access.log.1",
+                    "/var/log/mydomain.com.access.log.2.gz",
+                    "/var/log/mydomain.com.error.log",
+                    "/var/log/mydomain.com.error.log.1",
+                    "/var/log/mydomain.com.error.log.2.gz",
+                    "/var/log/mydomain.com.server.log",
+                    "/var/log/mydomain.com.server.log.1",
+                    "/var/log/mydomain.com.server.log.2.gz",
+                ]
+            ),
+        )
 
         logs = Webapp("mydomain.com").get_log_info()
 

tests/test_django_project.py

@@ -70,8 +70,8 @@ def test_if_requirements_txt_exists(self, fake_home):
 
 
 @pytest.fixture
-def project_with_mock_virtualenv():
-    project = DjangoProject('mydomain.com', 'python.version')
+def project_with_mock_virtualenv(virtualenvs_folder):
+    project = DjangoProject("mydomain.com", "python.version")
     project.virtualenv.create = Mock()
     project.virtualenv.pip_install = Mock()
     yield project

tests/test_virtualenvs.py

@@ -27,8 +27,7 @@ def test_create_calls_mkvirtualenv_with_python_version_and_domain(self, mock_sub
         args, kwargs = mock_subprocess.check_call.call_args
         command_list = args[0]
         bash_command = command_list[2]
-        assert 'mkvirtualenv --python=/usr/bin/python2.7 domain.com' in bash_command
-
+        assert "mkvirtualenv --python=python2.7 domain.com" in bash_command
 
     def test_nuke_option_deletes_virtualenv(self, mock_subprocess, virtualenvs_folder):
         v = Virtualenv('domain.com', '2.7')