[Test] More rework of the tests

diff --git a/test/functional/cases/150_rspamadm.robot b/test/functional/cases/150_rspamadm.robot
index ba9bef5bd483e2c3acc068a9260ade6d2934ac32..6bff14b2e3775816c52d5fdaad029da47dd51968 100644 (file)
--- a/test/functional/cases/150_rspamadm.robot
+++ b/test/functional/cases/150_rspamadm.robot
@@ -1,8 +1,8 @@
 *** Settings ***
 Suite Setup     Rspamadm Setup
 Suite Teardown  Rspamadm Teardown
-Library         Process
-Library         ../lib/rspamd.py
+Library         ${RSPAMD_TESTDIR}/lib/rspamd.py
+Resource        ${RSPAMD_TESTDIR}/lib/rspamd.robot
 
 *** Test Cases ***
 Config Test
@@ -46,20 +46,3 @@ Verbose mode
   Should Match Regexp  ${result.stderr}  ^$
   Should Match Regexp  ${result.stdout}  hello world\n
   Should Be Equal As Integers  ${result.rc}  0
-
-*** Keywords ***
-Rspamadm Setup
-  ${RSPAMADM_TMPDIR} =  Make Temporary Directory
-  Set Suite Variable  ${RSPAMADM_TMPDIR}
-
-Rspamadm Teardown
-  Cleanup Temporary Directory  ${RSPAMADM_TMPDIR}
-
-Rspamadm
-  [Arguments]  @{args}
-  ${result} =  Run Process  ${RSPAMADM}
-  ...  --var\=TMPDIR\=${RSPAMADM_TMPDIR}
-  ...  --var\=DBDIR\=${RSPAMADM_TMPDIR}
-  ...  --var\=LOCAL_CONFDIR\=/nonexistent
-  ...  @{args}
-  [Return]  ${result}

diff --git a/test/functional/lib/rspamd.robot b/test/functional/lib/rspamd.robot
index a5f8973659bc454c8067ab9f07991a8998e06a75..f9614c6fa0b7797c5f845c0a3f5d1b16e4d5fdaf 100644 (file)
--- a/test/functional/lib/rspamd.robot
+++ b/test/functional/lib/rspamd.robot
@@ -289,6 +289,7 @@ Run Rspamd
   ...  --var\=DBDIR\=${RSPAMD_TMPDIR}
   ...  --var\=LOCAL_CONFDIR\=/non-existent
   ...  --var\=CONFDIR\=${RSPAMD_TESTDIR}/../../conf/
+  ...  --insecure
   ...  env:RSPAMD_LOCAL_CONFDIR=/non-existent
   ...  env:RSPAMD_TMPDIR=${RSPAMD_TMPDIR}
   ...  env:RSPAMD_CONFDIR=${RSPAMD_TESTDIR}/../../conf/
@@ -302,6 +303,21 @@ Run Rspamd
   # Confirm worker is reachable
   Wait Until Keyword Succeeds  15x  1 sec  Ping Rspamd  ${RSPAMD_LOCAL_ADDR}  ${check_port}
 
+Rspamadm Setup
+  ${RSPAMADM_TMPDIR} =  Make Temporary Directory
+  Set Suite Variable  ${RSPAMADM_TMPDIR}
+
+Rspamadm Teardown
+  Cleanup Temporary Directory  ${RSPAMADM_TMPDIR}
+
+Rspamadm
+  [Arguments]  @{args}
+  ${result} =  Run Process  ${RSPAMADM}
+  ...  --var\=TMPDIR\=${RSPAMADM_TMPDIR}
+  ...  --var\=DBDIR\=${RSPAMADM_TMPDIR}
+  ...  --var\=LOCAL_CONFDIR\=/nonexistent
+  ...  @{args}
+  [Return]  ${result}
 
 Run Nginx
   ${template} =  Get File  ${RSPAMD_TESTDIR}/configs/nginx.conf

diff --git a/test/functional/lib/vars.py b/test/functional/lib/vars.py
index a4bcbadda4ee074025c6c3d76edf99bb7110dd08..bee2e92d409015f2c7aa177bdd90e19b194d7560 100644 (file)
--- a/test/functional/lib/vars.py
+++ b/test/functional/lib/vars.py
@@ -11,54 +11,7 @@
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
+
 
 import shutil
 import socket