From 3ce307aa059a9659341ead4bc239277650aea47f Mon Sep 17 00:00:00 2001 From: Chichi Lalescu <Cristian.Lalescu@ds.mpg.de> Date: Sat, 26 Dec 2015 22:32:43 +0100 Subject: [PATCH] update test_io also, tests are no longer executable files. I guess I no longer need that particular hack... --- tests/base.py | 0 tests/test_convergence.py | 0 tests/test_frozen_field.py | 0 tests/test_interpolation.py | 0 tests/test_io.py | 10 +++++++--- tests/test_particles.py | 0 tests/test_plain.py | 0 tests/test_scaling.py | 0 tests/test_time_step.py | 0 tox_io.ini | 14 -------------- 10 files changed, 7 insertions(+), 17 deletions(-) mode change 100755 => 100644 tests/base.py mode change 100755 => 100644 tests/test_convergence.py mode change 100755 => 100644 tests/test_frozen_field.py mode change 100755 => 100644 tests/test_interpolation.py mode change 100755 => 100644 tests/test_io.py mode change 100755 => 100644 tests/test_particles.py mode change 100755 => 100644 tests/test_plain.py mode change 100755 => 100644 tests/test_scaling.py mode change 100755 => 100644 tests/test_time_step.py delete mode 100644 tox_io.ini diff --git a/tests/base.py b/tests/base.py old mode 100755 new mode 100644 diff --git a/tests/test_convergence.py b/tests/test_convergence.py old mode 100755 new mode 100644 diff --git a/tests/test_frozen_field.py b/tests/test_frozen_field.py old mode 100755 new mode 100644 diff --git a/tests/test_interpolation.py b/tests/test_interpolation.py old mode 100755 new mode 100644 diff --git a/tests/test_io.py b/tests/test_io.py old mode 100755 new mode 100644 index 0d8b8c05..447cb405 --- a/tests/test_io.py +++ b/tests/test_io.py @@ -1,4 +1,3 @@ -#! /usr/bin/env python2 ####################################################################### # # # Copyright 2015 Max Planck Institute # @@ -25,7 +24,7 @@ -from test_base import * +from base import * class test_io(bfps.code): def __init__( @@ -43,7 +42,12 @@ class test_io(bfps.code): return None if __name__ == '__main__': - opt = parser.parse_args() + opt = parser.parse_args( + ['-n', '32', + '--run', + '--initialize', + '--ncpu', '2'] + + sys.argv[1:]) c = test_io(work_dir = opt.work_dir + '/io') c.write_src() c.write_par() diff --git a/tests/test_particles.py b/tests/test_particles.py old mode 100755 new mode 100644 diff --git a/tests/test_plain.py b/tests/test_plain.py old mode 100755 new mode 100644 diff --git a/tests/test_scaling.py b/tests/test_scaling.py old mode 100755 new mode 100644 diff --git a/tests/test_time_step.py b/tests/test_time_step.py old mode 100755 new mode 100644 diff --git a/tox_io.ini b/tox_io.ini deleted file mode 100644 index de8c2fc5..00000000 --- a/tox_io.ini +++ /dev/null @@ -1,14 +0,0 @@ -[tox] -envlist = py27, py34 -[testenv] -deps = matplotlib -whitelist_externals = - echo - cp -passenv = LD_LIBRARY_PATH -changedir = - {envtmpdir} -commands = - cp -r {toxinidir}/tests {envtmpdir} - python tests/test_io.py -n 32 --run --initialize --ncpu 2 - -- GitLab