tests: move .cache to build, rename test/_utils.vim

This commit is contained in:
Daniel Hahler
2018-04-18 09:37:17 +02:00
committed by Dave Halter
parent 1c3078e9f9
commit 7894b38c0c
5 changed files with 5 additions and 5 deletions

View File

@@ -11,6 +11,6 @@ check: build/vint
build/vint/bin/vint $(LINT_FILES) build/vint/bin/vint $(LINT_FILES)
clean: clean:
rm -rf .cache build rm -rf build
.PHONY: test check clean .PHONY: test check clean

View File

@@ -6,7 +6,7 @@ import zipfile
import pytest import pytest
VSPEC_URL = 'https://github.com/kana/vim-vspec/archive/1.4.1.zip' VSPEC_URL = 'https://github.com/kana/vim-vspec/archive/1.4.1.zip'
CACHE_FOLDER = '.cache' CACHE_FOLDER = 'build'
VSPEC_FOLDER = os.path.join(CACHE_FOLDER, 'vim-vspec-1.4.1') VSPEC_FOLDER = os.path.join(CACHE_FOLDER, 'vim-vspec-1.4.1')
VSPEC_RUNNER = os.path.join(VSPEC_FOLDER, 'bin/vspec') VSPEC_RUNNER = os.path.join(VSPEC_FOLDER, 'bin/vspec')
TEST_DIR = 'test' TEST_DIR = 'test'
@@ -68,7 +68,7 @@ def pytest_generate_tests(metafunc):
""" """
def collect_tests(): def collect_tests():
for f in os.listdir(TEST_DIR): for f in os.listdir(TEST_DIR):
if f.endswith('.vim') and f != 'utils.vim': if f.endswith('.vim') and f != '_utils.vim':
yield IntegrationTestFile(os.path.join(TEST_DIR, f)) yield IntegrationTestFile(os.path.join(TEST_DIR, f))
tests = list(collect_tests()) tests = list(collect_tests())

View File

@@ -1,6 +1,6 @@
let mapleader = '\' let mapleader = '\'
source plugin/jedi.vim source plugin/jedi.vim
source test/utils.vim source test/_utils.vim
describe 'goto simple' describe 'goto simple'
before before

View File

@@ -1,5 +1,5 @@
source plugin/jedi.vim source plugin/jedi.vim
source test/utils.vim source test/_utils.vim
describe 'pyimport' describe 'pyimport'
before before