Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CI/CD support #33

Open
wants to merge 23 commits into
base: master
Choose a base branch
from
Open

CI/CD support #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
f00c9fa
added creds
leevardaro Jan 25, 2022
204fe3d
added creds
leevardaro Jan 25, 2022
b4e87d6
fixed pom
leevardaro Jan 25, 2022
8e745ee
fixed pom
leevardaro Jan 25, 2022
33eec94
fixed pom
leevardaro Jan 25, 2022
33d2865
fixed pom
leevardaro Jan 25, 2022
0f77681
fixed pom
leevardaro Jan 25, 2022
36648c1
increased threads
leevardaro Jan 25, 2022
13a5a4e
increased threads
leevardaro Jan 25, 2022
b8ed430
added parallel to suites
leevardaro Jan 25, 2022
7869321
cleaned up pom and configs
leevardaro Feb 1, 2022
4dc9bad
added configs to POM for CI/CD and parallel threads
leevardaro Feb 1, 2022
17366bb
added configs to POM for CI/CD and parallel threads
leevardaro Feb 1, 2022
49f7196
removing user and key
leevardaro Feb 3, 2022
90b72f9
removing user and key
leevardaro Feb 3, 2022
122a24c
removing user and key
leevardaro Feb 3, 2022
dbabe53
removing user and key
leevardaro Feb 3, 2022
c809dbd
removing user and key
leevardaro Feb 3, 2022
0ddf927
removing user and key
leevardaro Feb 3, 2022
f920bdd
removing user and key
leevardaro Feb 7, 2022
d888450
removing user and key
leevardaro Feb 7, 2022
9aa71fc
add build name
leevardaro Feb 22, 2022
a4b9db9
add build name
leevardaro Feb 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/parallel.testng.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
<suite name="Parallel" thread-count="3" parallel="tests">
<suite name="Parallel" thread-count="10" parallel="tests">
<test name="SingleTestEnv1">
<parameter name="config" value="parallel.conf.json"/>
<parameter name="environment" value="env1"/>
Expand Down
4 changes: 2 additions & 2 deletions config/suite.testng.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
<suite name="Pool" parallel="tests">
<test name="PoolTestChrome" thread-count="3" parallel="classes">
<test name="PoolTestChrome" thread-count="10" parallel="classes">
<parameter name="config" value="suite.conf.json"/>
<parameter name="environment" value="chrome"/>
<classes>
Expand All @@ -18,7 +18,7 @@
</classes>
</test>

<test name="PoolTestFirefox" thread-count="3" parallel="classes">
<test name="PoolTestFirefox" thread-count="10" parallel="classes">
<parameter name="config" value="suite.conf.json"/>
<parameter name="environment" value="firefox"/>
<classes>
Expand Down
20 changes: 18 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.6</maven.compiler.source>
<maven.compiler.target>1.6</maven.compiler.target>
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
<surefire.version>2.19.1</surefire.version>

<test.file></test.file>
Expand Down Expand Up @@ -54,6 +54,22 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.18.1</version>
<configuration>
<parallel>methods</parallel>
<threadCount>20</threadCount>
<suiteXmlFiles>
<suiteXmlFile>config/single.testng.xml</suiteXmlFile>
<suiteXmlFile>config/local.testng.xml</suiteXmlFile>
<suiteXmlFile>config/parallel.testng.xml</suiteXmlFile>
<suiteXmlFile>config/suite.testng.xml</suiteXmlFile>
</suiteXmlFiles>
<properties>
<property>
<name>suitethreadpoolsize</name>
<value>5</value>
</property>
</properties>
</configuration>
</plugin>
</plugins>
</build>
Expand Down
2 changes: 2 additions & 0 deletions src/test/java/com/browserstack/BrowserStackTestNGTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ public void setUp(String config_file, String environment) throws Exception {
if (accessKey == null) {
accessKey = (String) config.get("key");
}
String buildName = System.getenv("BROWSERSTACK_BUILD_NAME");
capabilities.setCapability("build", buildName);

if (capabilities.getCapability("browserstack.local") != null
&& capabilities.getCapability("browserstack.local") == "true") {
Expand Down