Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/zabbix/zabbix.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergejs Olonkins <sergejs.olonkins@zabbix.com>2020-06-03 17:04:41 +0300
committerSergejs Olonkins <sergejs.olonkins@zabbix.com>2020-06-03 17:06:52 +0300
commitd2bf24e5d279d9be8cdd494b7295b78dae8cc41a (patch)
treee68c1096cbea6559dc90b533186e4724dac9f0ee /build.xml
parent57c91f4aa564f85fe91d41de541ec12d59b7c568 (diff)
.......... [DEV-1481] created new autotest for modules page
* commit '515f2d55465d4179f46532b0ae6f476e18cf4343': .......... [DEV-1481] coding style fixes as per review comments .......... [DEV-1481] updated branch to the latest 5.0 release .......... [DEV-1481] coding style fixes .......... [DEV-1481] minor fixes .......... [DEV-1481] created MessageBehavior and updated autotest accordingly .......... [DEV-1481] updated scenario as per review comments .......... [DEV-1481] added two test modules .......... [DEV-1481] added minor code fixes .......... [DEV-1481] minor message fix in autotest .......... [DEV-1481] split message details for verification due to different module name sorting from Jenkins side .......... [DEV-1481] fixed module copy paths in build.xml .......... [DEV-1481] created new autotest for modules (cherry picked from commit 4e6be1a22f2feae4870e2cdb1658b9a430d628e9)
Diffstat (limited to 'build.xml')
-rw-r--r--build.xml9
1 files changed, 7 insertions, 2 deletions
diff --git a/build.xml b/build.xml
index c79718188ca..4080368c64b 100644
--- a/build.xml
+++ b/build.xml
@@ -61,6 +61,11 @@
<copy overwrite="true" file="src/go/conf/zabbix_agent2.conf" tofile="conf/zabbix_agent2.conf"/>
</target>
+ <target name="init-frontend-modules">
+ <!-- Copy modules directory for selenium tests -->
+ <copydir forceoverwrite="true" src="ui/tests/selenium/modules" dest="ui/modules"/>
+ </target>
+
<target name="make-dbschema">
<!-- Create database schema -->
<exec executable="./bootstrap.sh" failonerror="on"/>
@@ -174,7 +179,7 @@
</exec>
</target>
- <target name="init-frontend-postgresql" depends="create-configs,make-dbschema,init-server-postgresql">
+ <target name="init-frontend-postgresql" depends="create-configs,make-dbschema,init-server-postgresql,init-frontend-modules">
<exec executable="psql" input="ui/tests/selenium/data/data_test.sql" failonerror="on">
<env key="PGPASSWORD" value="${dbpassword}"/>
<arg line="-q"/>
@@ -290,7 +295,7 @@
</exec>
</target>
- <target name="init-frontend-mysql" depends="create-configs,make-dbschema,init-server-mysql">
+ <target name="init-frontend-mysql" depends="create-configs,make-dbschema,init-server-mysql,init-frontend-modules">
<exec executable="mysql" input="ui/tests/selenium/data/data_test.sql" failonerror="on">
<arg line="--host=${dbhost}"/>
<arg line="--user=${dbuser}"/>