Skip to content

Commit 0914080

Browse files
authored
Merge pull request sigmavirus24#754 from sigmavirus24/fix-ci
Ensure we never try to talk to the network on CI
2 parents d94a00a + 0332689 commit 0914080

File tree

5 files changed

+8
-3
lines changed

5 files changed

+8
-3
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ notifications:
1111

1212
env:
1313
global:
14-
- TRAVIS_GH3="True"
14+
- GH_RECORD_MODE='none'
1515

1616
matrix:
1717
include:

appveyor.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
version: build-{build}-{branch}
22

33
environment:
4+
GH_RECORD_MODE: "none"
45
matrix:
56
# http://www.appveyor.com/docs/installed-software#python lists available
67
# versions

tests/conftest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
with betamax.Betamax.configure() as config:
1414
config.cassette_library_dir = 'tests/cassettes'
1515

16-
record_mode = 'never' if os.environ.get('TRAVIS_GH3') else 'once'
16+
record_mode = os.environ.get('GH_RECORD_MODE', 'once')
1717

1818
config.default_cassette_options['record_mode'] = record_mode
1919

tests/integration/test_repos_release.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,15 @@
22
import os
33
import tempfile
44

5+
import pytest
6+
57
from .helper import IntegrationHelper
68

79

810
class TestRelease(IntegrationHelper):
11+
"""Release class integration tests."""
912

13+
@pytest.mark.xfail('os.environ.get("APPVEYOR") == "True"')
1014
def test_archive(self):
1115
"""Test the ability to download a release archive."""
1216
cassette_name = self.cassette_name('archive')

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ envlist = py{27,34,35,py},py{27,34}-flake8,docstrings
33
minversion = 2.5.0
44

55
[testenv]
6-
passenv = GH_*
6+
passenv = GH_* APPVEYOR*
77
pip_pre = False
88
deps =
99
requests{env:REQUESTS_VERSION:>=2.0}

0 commit comments

Comments
 (0)