Skip to content

Commit

Permalink
merging dev into master
Browse files Browse the repository at this point in the history
  • Loading branch information
fcollman committed Apr 23, 2018
2 parents 5607414 + edd07ec commit 671801f
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 7 deletions.
18 changes: 18 additions & 0 deletions .appveyor.yml
@@ -0,0 +1,18 @@
build: false

environment:
matrix:
- MINICONDA: "C:\\Miniconda-x64"
PYTHON: 2.7
- MINICONDA: "C:\\Miniconda36-x64"
PYTHON: 3.6

install:
- set PATH=%MINICONDA%;%MINICONDA%\\Scripts;%PATH%
- conda config --set always_yes yes --set changeps1 no
- conda update -q conda
- pip install -r test_requirements.txt
- pip install -r requirements.txt

test_script:
- python setup.py test
2 changes: 1 addition & 1 deletion setup.cfg
@@ -1,5 +1,5 @@
[tool:pytest]
addopts = --boxed --cov=argschema --cov-report html --junitxml=test-reports/test.xml
addopts = --cov=argschema --cov-report html --junitxml=test-reports/test.xml

[aliases]
test=pytest
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Expand Up @@ -7,7 +7,7 @@
test_required = f.read().splitlines()

setup(name='argschema',
version='1.16.5',
version='1.16.6',
description=' a wrapper for setting up modules that can have parameters specified by command line arguments,\
json_files, or dictionary objects. Providing a common wrapper for data processing modules.',
author='Forrest Collman,David Feng',
Expand Down
15 changes: 10 additions & 5 deletions test/fields/test_files.py
Expand Up @@ -3,6 +3,7 @@
from argschema.fields import InputFile, OutputFile, InputDir, OutputDir
import marshmallow as mm
import os
import stat


# OUTPUT FILE TESTS
Expand All @@ -22,11 +23,12 @@ class BasicOutputFile(ArgSchema):

def test_outputfile_no_write(tmpdir):
outdir = tmpdir.mkdir('cannot_write_here')
outdir.chmod(0o222)
outdir.chmod(0o444)
outfile = outdir.join('test')
with pytest.raises(mm.ValidationError):
mod = ArgSchemaParser(input_data={'output_file': str(outfile)},
schema_type=BasicOutputFile)
outdir.chmod(0o666)


def test_outputfile_not_a_path():
Expand Down Expand Up @@ -71,18 +73,21 @@ class BasicOutputDir(ArgSchema):
output_dir = OutputDir(required=True, description="basic output dir")


def test_output_dir_basic():
def test_output_dir_basic(tmpdir):
outdir = tmpdir.mkdir('mytmp')
output_dir_example = {
'output_dir': '/tmp/mytmp'
'output_dir': str(outdir)
}
mod = ArgSchemaParser(schema_type=BasicOutputDir,
input_data=output_dir_example,
args=[])


def test_output_dir_bad_permission():
def test_output_dir_bad_permission(tmpdir):
outdir = tmpdir.mkdir('no_write')
outdir.chmod(0o222)
output_dir_example = {
'output_dir': '/'
'output_dir': outdir
}
with pytest.raises(mm.ValidationError):
mod = ArgSchemaParser(schema_type=BasicOutputDir,
Expand Down

0 comments on commit 671801f

Please sign in to comment.