From 7894b38c0c109e488e85cd72fb969cfe5adbbd58 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Wed, 18 Apr 2018 09:37:17 +0200 Subject: [PATCH] tests: move .cache to build, rename test/_utils.vim --- Makefile | 2 +- conftest.py | 4 ++-- test/{utils.vim => _utils.vim} | 0 test/goto.vim | 2 +- test/pyimport.vim | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) rename test/{utils.vim => _utils.vim} (100%) diff --git a/Makefile b/Makefile index 22712ef..79374c7 100644 --- a/Makefile +++ b/Makefile @@ -11,6 +11,6 @@ check: build/vint build/vint/bin/vint $(LINT_FILES) clean: - rm -rf .cache build + rm -rf build .PHONY: test check clean diff --git a/conftest.py b/conftest.py index ffb6c8e..17d923e 100644 --- a/conftest.py +++ b/conftest.py @@ -6,7 +6,7 @@ import zipfile import pytest 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_RUNNER = os.path.join(VSPEC_FOLDER, 'bin/vspec') TEST_DIR = 'test' @@ -68,7 +68,7 @@ def pytest_generate_tests(metafunc): """ def collect_tests(): 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)) tests = list(collect_tests()) diff --git a/test/utils.vim b/test/_utils.vim similarity index 100% rename from test/utils.vim rename to test/_utils.vim diff --git a/test/goto.vim b/test/goto.vim index 593125a..f4ef24d 100644 --- a/test/goto.vim +++ b/test/goto.vim @@ -1,6 +1,6 @@ let mapleader = '\' source plugin/jedi.vim -source test/utils.vim +source test/_utils.vim describe 'goto simple' before diff --git a/test/pyimport.vim b/test/pyimport.vim index 83aca15..8b5f058 100644 --- a/test/pyimport.vim +++ b/test/pyimport.vim @@ -1,5 +1,5 @@ source plugin/jedi.vim -source test/utils.vim +source test/_utils.vim describe 'pyimport' before