GeezerVison is showing github.com — apveyor: simplify test. · gitpython-developers/GitPython@5899c59
File tree
Expand file treeCollapse file tree
Open diff view settings
Expand file treeCollapse file tree
Open diff view settings
Collapse file
Copy file name to clipboardExpand all lines: .appveyor.yml +7-13Lines changed: 7 additions & 13 deletions | Original file line number | Diff line number | Diff line change |
|---|
|
2 | 2 | environment: |
3 | 3 |
|
4 | 4 | matrix: |
5 | | - - PYTHON: "C:\\Miniconda" |
| 5 | + - PYTHON: "C:\\Python27" |
6 | 6 | PYTHON_VERSION: "2.7" |
7 | 7 | - PYTHON: "C:\\Miniconda" |
8 | 8 | PYTHON_VERSION: "2.7" |
9 | | - GIT_PATH: "C:\\cygwin64\\bin" |
| 9 | + GIT_PATH: "C:\\cygwin\\bin" |
10 | 10 |
|
11 | 11 | - PYTHON: "C:\\Miniconda3-x64" |
12 | 12 | PYTHON_VERSION: "3.4" |
13 | | - - PYTHON: "C:\\Miniconda3-x64" |
| 13 | + - PYTHON: "C:\\Python34" |
14 | 14 | PYTHON_VERSION: "3.4" |
15 | 15 | GIT_PATH: "C:\\cygwin64\\bin" |
16 | 16 |
|
@@ -32,7 +32,9 @@ install: |
32 | 32 | python -c "import struct; print(struct.calcsize('P') * 8)" |
33 | 33 | conda info -a |
34 | 34 |
|
35 | | - - conda install --yes --quiet pip |
| 35 | + - IF EXIST "%PYTHON%\conda.exe" ( |
| 36 | + conda install --yes --quiet pip |
| 37 | + ) |
36 | 38 | - pip install nose wheel coveralls |
37 | 39 | - IF "%PYTHON_VERSION%"=="2.7" ( |
38 | 40 | pip install mock |
@@ -60,15 +62,7 @@ install: |
60 | 62 | build: off |
61 | 63 |
|
62 | 64 | test_script: |
63 | | - - | |
64 | | - echo "+++ Checking archives for PyPI repo..." |
65 | | - python setup.py bdist_wheel |
66 | | -
|
67 | | - - IF "%PYTHON_VERSION%"=="3.4" ( |
68 | | - nosetests -v --with-coverage |
69 | | - ) ELSE ( |
70 | | - nosetests -v |
71 | | - ) |
| 65 | + - "nosetests -v" |
72 | 66 |
|
73 | 67 | #on_success: |
74 | 68 | # - IF "%PYTHON_VERSION%"=="3.4" (coveralls) |
Collapse file
Copy file name to clipboardExpand all lines: git/test/test_util.py +1-1Lines changed: 1 addition & 1 deletion | Original file line number | Diff line number | Diff line change |
|---|
@@ -90,7 +90,7 @@ def test_blocking_lock_file(self): |
90 | 90 | wait_lock = BlockingLockFile(my_file, 0.05, wait_time) |
91 | 91 | self.failUnlessRaises(IOError, wait_lock._obtain_lock) |
92 | 92 | elapsed = time.time() - start |
93 | | - assert elapsed <= wait_time + 0.02 # some extra time it may cost |
| 93 | + assert elapsed <= wait_time + 0.02, elapsed # some extra time it may cost |
94 | 94 |
|
95 | 95 | def test_user_id(self): |
96 | 96 | assert '@' in get_user_id() |
|