You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by vl...@apache.org on 2019/10/07 14:22:17 UTC
[jmeter] branch vlsi/github_actions updated (89a9d8b -> 42194bb)
This is an automated email from the ASF dual-hosted git repository.
vladimirsitnikov pushed a change to branch vlsi/github_actions
in repository https://gitbox.apache.org/repos/asf/jmeter.git.
discard 89a9d8b Add vlsi/github_actions branch
discard 9c06df0 Add GitHub Actions CI
discard 4b00235 Fix DNSCacheManagerSpec test so it supports system with multiple DNS servers
new fbc837a Fix DNSCacheManagerSpec test so it supports system with multiple DNS servers
new 9c22eae Add GitHub Actions CI
new 42194bb Add vlsi/github_actions branch
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (89a9d8b)
\
N -- N -- N refs/heads/vlsi/github_actions (42194bb)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/main.yml | 2 +-
build.gradle.kts | 11 ++++++++---
2 files changed, 9 insertions(+), 4 deletions(-)
[jmeter] 03/03: Add vlsi/github_actions branch
Posted by vl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vladimirsitnikov pushed a commit to branch vlsi/github_actions
in repository https://gitbox.apache.org/repos/asf/jmeter.git
commit 42194bbb1b95b7f872623283518289e84d056cd4
Author: Vladimir Sitnikov <si...@gmail.com>
AuthorDate: Mon Oct 7 15:40:09 2019 +0300
Add vlsi/github_actions branch
---
.github/workflows/main.yml | 20 +++++++-------------
1 file changed, 7 insertions(+), 13 deletions(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 60c54c1..6c96998 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -4,27 +4,19 @@ on:
push:
branches:
- '*'
+ - vlsi/github_actions
pull_request:
branches:
- '*'
jobs:
- linux:
- name: 'Linux (JDK 12)'
- runs-on: ubuntu-latest
- container: junitteam/build:latest
- steps:
- - uses: actions/checkout@master
- - name: 'Test'
- run: |
- ./gradlew --version
- ./gradlew build
-
windows:
name: 'Windows (JDK 12)'
runs-on: windows-latest
steps:
- uses: actions/checkout@master
+ with:
+ fetch-depth: 50
- name: 'Set up JDK 12'
uses: actions/setup-java@v1
with:
@@ -33,13 +25,15 @@ jobs:
shell: bash
run: |
./gradlew --version
- ./gradlew build
+ ./gradlew build -x distTar -x distTarSha512 -x signDistTar -x distTarSource -x distTarSourceSha512 -x signDistTarSource
mac:
name: 'Mac OS (JDK 12)'
runs-on: macos-latest
steps:
- uses: actions/checkout@master
+ with:
+ fetch-depth: 50
- name: 'Set up JDK 12'
uses: actions/setup-java@v1
with:
@@ -47,4 +41,4 @@ jobs:
- name: 'Test'
run: |
./gradlew --version
- ./gradlew build
+ ./gradlew build -x distTar -x distTarSha512 -x signDistTar -x distTarSource -x distTarSourceSha512 -x signDistTarSource -Dskip.test_TestDNSCacheManager.testWithCustomResolverAnd1Server=true
[jmeter] 02/03: Add GitHub Actions CI
Posted by vl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vladimirsitnikov pushed a commit to branch vlsi/github_actions
in repository https://gitbox.apache.org/repos/asf/jmeter.git
commit 9c22eaecdc04abb1bee3c86c981f23862258b008
Author: Vladimir Sitnikov <si...@gmail.com>
AuthorDate: Mon Oct 7 13:58:40 2019 +0300
Add GitHub Actions CI
---
.github/workflows/main.yml | 50 ++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 50 insertions(+)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
new file mode 100644
index 0000000..60c54c1
--- /dev/null
+++ b/.github/workflows/main.yml
@@ -0,0 +1,50 @@
+name: CI
+
+on:
+ push:
+ branches:
+ - '*'
+ pull_request:
+ branches:
+ - '*'
+
+jobs:
+ linux:
+ name: 'Linux (JDK 12)'
+ runs-on: ubuntu-latest
+ container: junitteam/build:latest
+ steps:
+ - uses: actions/checkout@master
+ - name: 'Test'
+ run: |
+ ./gradlew --version
+ ./gradlew build
+
+ windows:
+ name: 'Windows (JDK 12)'
+ runs-on: windows-latest
+ steps:
+ - uses: actions/checkout@master
+ - name: 'Set up JDK 12'
+ uses: actions/setup-java@v1
+ with:
+ java-version: 12
+ - name: 'Test'
+ shell: bash
+ run: |
+ ./gradlew --version
+ ./gradlew build
+
+ mac:
+ name: 'Mac OS (JDK 12)'
+ runs-on: macos-latest
+ steps:
+ - uses: actions/checkout@master
+ - name: 'Set up JDK 12'
+ uses: actions/setup-java@v1
+ with:
+ java-version: 12
+ - name: 'Test'
+ run: |
+ ./gradlew --version
+ ./gradlew build
[jmeter] 01/03: Fix DNSCacheManagerSpec test so it supports system
with multiple DNS servers
Posted by vl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vladimirsitnikov pushed a commit to branch vlsi/github_actions
in repository https://gitbox.apache.org/repos/asf/jmeter.git
commit fbc837a2d9776a3ac25afcfab0d470a24f59270d
Author: Vladimir Sitnikov <si...@gmail.com>
AuthorDate: Mon Oct 7 16:34:51 2019 +0300
Fix DNSCacheManagerSpec test so it supports system with multiple DNS servers
---
build.gradle.kts | 11 ++++++++---
.../jmeter/protocol/http/control/DNSCacheManagerSpec.groovy | 12 ++++++++----
2 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/build.gradle.kts b/build.gradle.kts
index df367d1..74bb428 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -534,9 +534,14 @@ allprojects {
showStandardStreams = true
}
// Pass the property to tests
- systemProperty("java.awt.headless", System.getProperty("java.awt.headless"))
- systemProperty("junit.jupiter.execution.parallel.enabled", "true")
- systemProperty("junit.jupiter.execution.timeout.default", "2 m")
+ fun passProperty(name: String, default: String? = null) {
+ val value = System.getProperty(name) ?: default
+ value?.let { systemProperty(name, it) }
+ }
+ passProperty("java.awt.headless")
+ passProperty("skip.test_TestDNSCacheManager.testWithCustomResolverAnd1Server")
+ passProperty("junit.jupiter.execution.parallel.enabled", "true")
+ passProperty("junit.jupiter.execution.timeout.default", "2 m")
}
withType<SpotBugsTask>().configureEach {
group = LifecycleBasePlugin.VERIFICATION_GROUP
diff --git a/src/protocol/http/src/test/groovy/org/apache/jmeter/protocol/http/control/DNSCacheManagerSpec.groovy b/src/protocol/http/src/test/groovy/org/apache/jmeter/protocol/http/control/DNSCacheManagerSpec.groovy
index 3bf9baf..fc242e0 100644
--- a/src/protocol/http/src/test/groovy/org/apache/jmeter/protocol/http/control/DNSCacheManagerSpec.groovy
+++ b/src/protocol/http/src/test/groovy/org/apache/jmeter/protocol/http/control/DNSCacheManagerSpec.groovy
@@ -26,7 +26,7 @@ import spock.lang.IgnoreIf
class DNSCacheManagerSpec extends JMeterSpec {
- private static final String VALID_DNS_SERVER = ResolverConfig.getCurrentConfig().servers()[0];
+ private static final String[] VALID_DNS_SERVERS = ResolverConfig.getCurrentConfig().servers()
private static final String INVALID_DNS_SERVER = "512.1.1.1"
static def localDNSResolverFailed() {
@@ -97,20 +97,24 @@ class DNSCacheManagerSpec extends JMeterSpec {
})
def "Valid DNS resolves and caches with custom resolve true"() {
given:
- sut.addServer(VALID_DNS_SERVER)
+ for (dns in VALID_DNS_SERVERS) {
+ sut.addServer(dns)
+ }
sut.setCustomResolver(true)
sut.setTimeoutMs(5000)
when:
sut.resolve("jmeter.apache.org")
then:
sut.resolver != null
- ((ExtendedResolver) sut.resolver).getResolvers().length == 1
+ ((ExtendedResolver) sut.resolver).getResolvers().length == VALID_DNS_SERVERS.length
sut.cache.size() == 1
}
def "Cache should be used where entries exist"() {
given:
- sut.addServer(VALID_DNS_SERVER)
+ for (dns in VALID_DNS_SERVERS) {
+ sut.addServer(dns)
+ }
sut.setCustomResolver(true)
sut.setTimeoutMs(5000)
when: