From 9189767027c14fd941dd08935ad04798a58051a2 Mon Sep 17 00:00:00 2001
From: Federico Felici <federico.felici@epfl.ch>
Date: Tue, 2 Jul 2019 17:40:14 +0200
Subject: [PATCH] Fix small test issues and add .gitlab-ci.yml
Basic tests pass on LAC
---
.gitlab-ci.yml | 34 ++++++++++++++++++++++++++++
matlab/run_gdat_tests.m | 2 +-
matlab/tests/test_requestnames.m | 7 +++---
matlab/tests/test_requestnames_AUG.m | 1 +
matlab/tests/test_requestnames_TCV.m | 1 +
5 files changed, 41 insertions(+), 4 deletions(-)
create mode 100644 .gitlab-ci.yml
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 00000000..e8dde536
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,34 @@
+# Includes a common template
+include:
+ - project: 'spc/tcv/tbx/git-tools-spc'
+ file: 'gitlab-ci-tbx-template.yml'
+
+# no build for gdat, so don't define jobs for this phase
+
+.deploy: # do later
+ extends: .deploy-to-lac-template
+
+test-matlab850-basic:
+ extends: .test-template
+ before_script:
+ - cd matlab
+ variables:
+ MATLABCMD: matlab850
+ TESTARGUMENT: basic
+
+test-matlab920:
+ extends: .test-template
+ before_script:
+ - cd matlab
+ variables:
+ MATLABCMD: matlab920
+
+.test-matlab850-deployed:
+ extends: .test-template-deployed
+ variables:
+ MATLABCMD: matlab850
+
+.test-matlab920-deployed:
+ extends: .test-template-deployed
+ variables:
+ MATLABCMD: matlab920
diff --git a/matlab/run_gdat_tests.m b/matlab/run_gdat_tests.m
index 93a84e97..3b290064 100644
--- a/matlab/run_gdat_tests.m
+++ b/matlab/run_gdat_tests.m
@@ -22,7 +22,7 @@ switch test_case
import matlab.unittest.selectors.HasName;
import matlab.unittest.constraints.ContainsSubstring;
- suite = suite_all.selectIf(HasName(ContainsSubstring('TCV')) & ...
+ suite = suite_all.selectIf(HasParameter('Value','TCV') & ...
(HasParameter('Value','ip') | HasParameter('Value','q_rho')));
case 'TCV'
suite = suite_all.selectIf(HasParameter('machine',IsEqualTo('TCV')));
diff --git a/matlab/tests/test_requestnames.m b/matlab/tests/test_requestnames.m
index 73e64be5..ec9a92ae 100644
--- a/matlab/tests/test_requestnames.m
+++ b/matlab/tests/test_requestnames.m
@@ -4,17 +4,18 @@ classdef (SharedTestFixtures={...
properties(TestParameter,Abstract)
% parameters that will vary during tests
+ machine;
shot;
request; % placeholders
end
methods(Test)
- function test_gdat_call(testCase,shot,request)
- testCase.assertTrue(isnumeric(num2str(shot)));
+ function test_gdat_call(testCase,machine,shot,request)
+ testCase.assertTrue(isnumeric(str2double(shot)));
testCase.assertTrue(ischar(request));
% gdat call
- gdat_call = sprintf(['gdat_' lower(testCase.machine) '(%s,''%s'')'],shot,request);
+ gdat_call = sprintf(['gdat_' lower(machine) '(%s,''%s'')'],shot,request);
% logging
testCase.log(sprintf('gdat_call: %s\n',gdat_call));
diff --git a/matlab/tests/test_requestnames_AUG.m b/matlab/tests/test_requestnames_AUG.m
index 18b5da42..f510dd66 100644
--- a/matlab/tests/test_requestnames_AUG.m
+++ b/matlab/tests/test_requestnames_AUG.m
@@ -3,6 +3,7 @@ classdef test_requestnames_AUG < test_requestnames
properties(TestParameter)
% parameters that will vary during tests
+ machine = {'AUG'};
shot = {'30594'};
request = get_all_gdat_requests('AUG');
end
diff --git a/matlab/tests/test_requestnames_TCV.m b/matlab/tests/test_requestnames_TCV.m
index 8f84cfec..871cd50e 100644
--- a/matlab/tests/test_requestnames_TCV.m
+++ b/matlab/tests/test_requestnames_TCV.m
@@ -3,6 +3,7 @@ classdef test_requestnames_TCV < test_requestnames
properties(TestParameter)
% parameters that will vary during tests
+ machine = {'TCV'};
shot = {'48836'};
request = get_all_gdat_requests('TCV');
end
--
GitLab