From 081cdb6b7be3384c373b53f44a60fab29d13e07f Mon Sep 17 00:00:00 2001 From: Anne Philipp <anne.philipp@univie.ac.at> Date: Sat, 17 Nov 2018 11:07:28 +0100 Subject: [PATCH] changed infrastructure of test dir/divide in test categories --- source/pythontest/_config_test.py | 2 +- test/Regression/test_cmp_mars_requests.py | 16 ++++++++++++++++ test/{ => Unit}/InstallTar/mk_install_tar.sh | 4 ++-- test/{ => Unit}/InstallTar/un_install_tar.sh | 8 ++++---- test/{ => Unit}/Testfiles/ECMWF_ENV.test | 0 test/{ => Unit}/Testfiles/compilejob.test | 0 test/{ => Unit}/Testfiles/convert.nl.test | 0 test/{ => Unit}/Testfiles/job.temp.test | 0 .../Testfiles/test_put_to_ecserver.txt | 0 9 files changed, 23 insertions(+), 7 deletions(-) create mode 100644 test/Regression/test_cmp_mars_requests.py rename test/{ => Unit}/InstallTar/mk_install_tar.sh (94%) rename test/{ => Unit}/InstallTar/un_install_tar.sh (74%) rename test/{ => Unit}/Testfiles/ECMWF_ENV.test (100%) rename test/{ => Unit}/Testfiles/compilejob.test (100%) rename test/{ => Unit}/Testfiles/convert.nl.test (100%) rename test/{ => Unit}/Testfiles/job.temp.test (100%) rename test/{ => Unit}/Testfiles/test_put_to_ecserver.txt (100%) diff --git a/source/pythontest/_config_test.py b/source/pythontest/_config_test.py index 359add1..630608f 100644 --- a/source/pythontest/_config_test.py +++ b/source/pythontest/_config_test.py @@ -37,7 +37,7 @@ import _config # ------------------------------------------------------------------------------ # DIRECTORY NAMES # ------------------------------------------------------------------------------ -TEST_DIR = 'test' +TEST_DIR = 'test/Unit' TESTFILES_DIR = 'Testfiles' TESTINSTALL_DIR = 'InstallTar' # ------------------------------------------------------------------------------ diff --git a/test/Regression/test_cmp_mars_requests.py b/test/Regression/test_cmp_mars_requests.py new file mode 100644 index 0000000..c30bda4 --- /dev/null +++ b/test/Regression/test_cmp_mars_requests.py @@ -0,0 +1,16 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- + + +# function read_mars_request +# function get_mars_request_neu + +if __name__ == "__main__": + + # compare 2 pandas dataframes from 7.1 and 7.0.3 mars request files + # 1. entscheiden wo die mars_requests stehen sollen. + # 2. für v7.1 müssten sie erzeugt werden + # 3. für 7.0.3. müssen sie bereits vorhanden sein + # 4. für 7.0.3 mars requests anzahl sollte variabel sein + # 5. brauche die entsprechenden control files dafür (spezifikationen nur dadurch) + # 6. diff --git a/test/InstallTar/mk_install_tar.sh b/test/Unit/InstallTar/mk_install_tar.sh similarity index 94% rename from test/InstallTar/mk_install_tar.sh rename to test/Unit/InstallTar/mk_install_tar.sh index b2771ae..dd714fe 100755 --- a/test/InstallTar/mk_install_tar.sh +++ b/test/Unit/InstallTar/mk_install_tar.sh @@ -12,7 +12,7 @@ path=../../ tarname='flex_extract_v7.1_local.tar' -tar -cvf ../../test/InstallTar/$tarname \ +tar -cvf ../../test/Unit/InstallTar/$tarname \ ${path}source/python/classes/*py \ ${path}source/python/mods/*py \ ${path}source/python/*py \ @@ -36,7 +36,7 @@ tar -cvf ../../test/InstallTar/$tarname \ tarname='flex_extract_v7.1_ecgate.tar' -tar -cvf ../../test/InstallTar/$tarname \ +tar -cvf ../../test/Unit/InstallTar/$tarname \ ${path}source/python/classes/*py \ ${path}source/python/mods/*py \ ${path}source/python/*py \ diff --git a/test/InstallTar/un_install_tar.sh b/test/Unit/InstallTar/un_install_tar.sh similarity index 74% rename from test/InstallTar/un_install_tar.sh rename to test/Unit/InstallTar/un_install_tar.sh index ac34be7..8788e93 100755 --- a/test/InstallTar/un_install_tar.sh +++ b/test/Unit/InstallTar/un_install_tar.sh @@ -9,16 +9,16 @@ tarname='flex_extract_v7.1_local.tar' dirname='flex_extract_v7.1_local' -path=../../test/InstallTar/ +path=../../test/Unit/InstallTar/ mkdir $path$dirname cd $path$dirname tar xvf ../$tarname -cd ../../../source/pythontest +cd ../../../../source/pythontest tarname='flex_extract_v7.1_ecgate.tar' dirname='flex_extract_v7.1_ecgate' -path=../../test/InstallTar/ +path=../../test/Unit/InstallTar/ mkdir $path$dirname cd $path$dirname tar xvf ../$tarname -cd ../../../source/pythontest \ No newline at end of file +cd ../../../../source/pythontest \ No newline at end of file diff --git a/test/Testfiles/ECMWF_ENV.test b/test/Unit/Testfiles/ECMWF_ENV.test similarity index 100% rename from test/Testfiles/ECMWF_ENV.test rename to test/Unit/Testfiles/ECMWF_ENV.test diff --git a/test/Testfiles/compilejob.test b/test/Unit/Testfiles/compilejob.test similarity index 100% rename from test/Testfiles/compilejob.test rename to test/Unit/Testfiles/compilejob.test diff --git a/test/Testfiles/convert.nl.test b/test/Unit/Testfiles/convert.nl.test similarity index 100% rename from test/Testfiles/convert.nl.test rename to test/Unit/Testfiles/convert.nl.test diff --git a/test/Testfiles/job.temp.test b/test/Unit/Testfiles/job.temp.test similarity index 100% rename from test/Testfiles/job.temp.test rename to test/Unit/Testfiles/job.temp.test diff --git a/test/Testfiles/test_put_to_ecserver.txt b/test/Unit/Testfiles/test_put_to_ecserver.txt similarity index 100% rename from test/Testfiles/test_put_to_ecserver.txt rename to test/Unit/Testfiles/test_put_to_ecserver.txt -- GitLab