Fix tests

Author: stsewd

readthedocs/projects/tasks.py

@@ -311,6 +311,13 @@ def validate_duplicate_reserved_versions(self, tags_data, branches_data):
                     RepositoryError.DUPLICATED_RESERVED_VERSIONS,
                 )
 
+    def get_vcs_env_vars(self):
+        """Get environment variables to be included in the VCS setup step."""
+        env = self.get_rtd_env_vars()
+        # Don't prompt for username, this requires Git 2.3+
+        env['GIT_TERMINAL_PROMPT'] = '0'
+        return env
+
     def get_rtd_env_vars(self):
         """Get bash environment variables specific to Read the Docs."""
         env = {
@@ -962,13 +969,6 @@ def get_env_vars(self):
 
         return env
 
-    def get_vcs_env_vars(self):
-        """Get environment variables to be included in the VCS setup step."""
-        env = self.get_rtd_env_vars()
-        # Don't prompt for username, this requires Git 2.3+
-        env['GIT_TERMINAL_PROMPT'] = '0'
-        return env
-
     def set_valid_clone(self):
         """Mark on the project that it has been cloned properly."""
         api_v2.project(self.project.pk).patch(

readthedocs/rtd_tests/tests/test_doc_building.py

@@ -1024,7 +1024,7 @@ def test_command_env(self):
         env = {'FOOBAR': 'foobar', 'BIN_PATH': 'foobar'}
         cmd = BuildCommand('echo', environment=env)
         for key in list(env.keys()):
-            self.assertEqual(cmd.environment[key], env[key])
+            self.assertEqual(cmd._environment[key], env[key])
 
     def test_result(self):
         """Test result of output using unix true/false commands."""