diff --git a/msa/black-box-tests/chrome_install.sh b/msa/black-box-tests/chrome_install.sh deleted file mode 100755 index 9d4588dcb4..0000000000 --- a/msa/black-box-tests/chrome_install.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash -# -# Copyright © 2016-2022 The Thingsboard Authors -# -# 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. -# - - -set -e # Any subsequent commands which fail will cause the shell script to exit immediately -CHROME_PATH=/tmp/google-chrome - -echo "Installing google-chrome to the $CHROME_PATH" - -rm -rf $CHROME_PATH -mkdir -p $CHROME_PATH -wget --no-verbose -P $CHROME_PATH https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb -dpkg-deb -xv $CHROME_PATH/google-chrome-stable_current_amd64.deb /tmp/google-chrome/ -rm $CHROME_PATH/google-chrome-stable_current_amd64.deb - -echo "Use google-binary as ChromeOptions options = new ChromeOptions(); options.setBinary(\"${CHROME_PATH}/opt/google/chrome/chrome\");" diff --git a/msa/black-box-tests/pom.xml b/msa/black-box-tests/pom.xml index e920f62a2a..eb7872ef7a 100644 --- a/msa/black-box-tests/pom.xml +++ b/msa/black-box-tests/pom.xml @@ -34,7 +34,7 @@ UTF-8 ${basedir}/../.. - blackBox + connectivity @@ -194,7 +194,7 @@ maven-surefire-plugin - src/test/resources/all.xml + src/test/resources/${suite}.xml ${blackBoxTests.skip} diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/CreateRuleChainTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/CreateRuleChainTest.java index 2685c59b38..1a373c0e54 100644 --- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/CreateRuleChainTest.java +++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/CreateRuleChainTest.java @@ -71,7 +71,7 @@ public class CreateRuleChainTest extends AbstractDriverBaseTest { Assert.assertTrue(ruleChainsPage.entity(ruleChainName).isDisplayed()); } - @Test(priority = 10, groups = "smoke") + @Test(priority = 10, groups = "smoke", enabled = false) @Description public void createRuleChainWithDescription() { ruleChainName = ENTITY_NAME; diff --git a/msa/black-box-tests/src/test/resources/all.xml b/msa/black-box-tests/src/test/resources/all.xml index 3a35ec5c16..02de3c0e89 100644 --- a/msa/black-box-tests/src/test/resources/all.xml +++ b/msa/black-box-tests/src/test/resources/all.xml @@ -1,7 +1,7 @@