You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by mm...@apache.org on 2020/08/28 15:18:48 UTC
[geode-native] branch GEODE-8460-docker-available created (now
3570cb0)
This is an automated email from the ASF dual-hosted git repository.
mmartell pushed a change to branch GEODE-8460-docker-available
in repository https://gitbox.apache.org/repos/asf/geode-native.git.
at 3570cb0 Configure docker based acceptance tests - Create new acceptance-test folders for cpp and cli - move existing sni tests to acceptance-test
This branch includes the following new commits:
new d848ad1 Remove defunct sni-test-config - got moved to root
new 3570cb0 Configure docker based acceptance tests - Create new acceptance-test folders for cpp and cli - move existing sni tests to acceptance-test
The 2 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.
[geode-native] 01/02: Remove defunct sni-test-config - got moved to
root
Posted by mm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mmartell pushed a commit to branch GEODE-8460-docker-available
in repository https://gitbox.apache.org/repos/asf/geode-native.git
commit d848ad1258323bb19653db8601d5fe5b4d073a0b
Author: Mike Martell <mm...@pivotal.io>
AuthorDate: Fri Aug 28 08:14:51 2020 -0700
Remove defunct sni-test-config
- got moved to root
---
.../test/sni-test-config/docker-compose.yml | 43 -------------
.../geode-config/gemfire.properties | 19 ------
.../geode-config/gfsecurity.properties | 27 --------
.../geode-config/locator-maeve-keystore.jks | Bin 2048 -> 0 bytes
.../geode-config/server-clementine-keystore.jks | Bin 2059 -> 0 bytes
.../geode-config/server-dolores-keystore.jks | Bin 2050 -> 0 bytes
.../sni-test-config/geode-config/truststore.jks | Bin 8095 -> 0 bytes
.../sni-test-config/geode-config/truststore.p12 | Bin 8983 -> 0 bytes
.../geode-config/truststore_sni.pem | 68 ---------------------
.../integration/test/sni-test-config/haproxy.cfg | 44 -------------
.../test/sni-test-config/scripts/forever | 20 ------
.../sni-test-config/scripts/geode-starter-2.gfsh | 23 -------
.../sni-test-config/scripts/geode-starter.gfsh | 22 -------
13 files changed, 266 deletions(-)
diff --git a/cppcache/integration/test/sni-test-config/docker-compose.yml b/cppcache/integration/test/sni-test-config/docker-compose.yml
deleted file mode 100644
index b0a6100..0000000
--- a/cppcache/integration/test/sni-test-config/docker-compose.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You 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.
-#
-version: '3'
-services:
- geode:
- container_name: 'geode'
- image: 'apachegeode/geode'
- expose:
- - '10334'
- - '40404'
- entrypoint: 'sh'
- command: ["-c", "while true; do sleep 600; done"]
- networks:
- geode-sni-test:
- volumes:
- - ./geode-config:/geode/config:ro
- - ./scripts:/geode/scripts
- haproxy:
- container_name: 'haproxy'
- image: 'haproxy:2.1'
- ports:
- - "15443"
- networks:
- geode-sni-test:
- volumes:
- - ./haproxy.cfg:/usr/local/etc/haproxy/haproxy.cfg:ro
-networks:
- geode-sni-test:
-
diff --git a/cppcache/integration/test/sni-test-config/geode-config/gemfire.properties b/cppcache/integration/test/sni-test-config/geode-config/gemfire.properties
deleted file mode 100644
index 1f13fb0..0000000
--- a/cppcache/integration/test/sni-test-config/geode-config/gemfire.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You 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.
-#
-
-statistic-sampling-enabled=true
-statistic-archive-file=statArchive.gfs
diff --git a/cppcache/integration/test/sni-test-config/geode-config/gfsecurity.properties b/cppcache/integration/test/sni-test-config/geode-config/gfsecurity.properties
deleted file mode 100644
index 813d260..0000000
--- a/cppcache/integration/test/sni-test-config/geode-config/gfsecurity.properties
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You 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.
-#
-
-security-log-level=info
-security-peer-verifymember-timeout=1000
-ssl-keystore-password=geode
-ssl-truststore=/geode/config/truststore.jks
-ssl-truststore-password=geode
-ssl-require-authentication=false
-ssl-web-require-authentication=false
-ssl-enabled-components=all
-ssl-endpoint-identification-enabled=false
-
diff --git a/cppcache/integration/test/sni-test-config/geode-config/locator-maeve-keystore.jks b/cppcache/integration/test/sni-test-config/geode-config/locator-maeve-keystore.jks
deleted file mode 100644
index a29cf0f..0000000
Binary files a/cppcache/integration/test/sni-test-config/geode-config/locator-maeve-keystore.jks and /dev/null differ
diff --git a/cppcache/integration/test/sni-test-config/geode-config/server-clementine-keystore.jks b/cppcache/integration/test/sni-test-config/geode-config/server-clementine-keystore.jks
deleted file mode 100644
index 380de6c..0000000
Binary files a/cppcache/integration/test/sni-test-config/geode-config/server-clementine-keystore.jks and /dev/null differ
diff --git a/cppcache/integration/test/sni-test-config/geode-config/server-dolores-keystore.jks b/cppcache/integration/test/sni-test-config/geode-config/server-dolores-keystore.jks
deleted file mode 100644
index cb2c4c5..0000000
Binary files a/cppcache/integration/test/sni-test-config/geode-config/server-dolores-keystore.jks and /dev/null differ
diff --git a/cppcache/integration/test/sni-test-config/geode-config/truststore.jks b/cppcache/integration/test/sni-test-config/geode-config/truststore.jks
deleted file mode 100644
index ffcdaf3..0000000
Binary files a/cppcache/integration/test/sni-test-config/geode-config/truststore.jks and /dev/null differ
diff --git a/cppcache/integration/test/sni-test-config/geode-config/truststore.p12 b/cppcache/integration/test/sni-test-config/geode-config/truststore.p12
deleted file mode 100644
index 339d775..0000000
Binary files a/cppcache/integration/test/sni-test-config/geode-config/truststore.p12 and /dev/null differ
diff --git a/cppcache/integration/test/sni-test-config/geode-config/truststore_sni.pem b/cppcache/integration/test/sni-test-config/geode-config/truststore_sni.pem
deleted file mode 100644
index 1857ce6..0000000
--- a/cppcache/integration/test/sni-test-config/geode-config/truststore_sni.pem
+++ /dev/null
@@ -1,68 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICrDCCAZSgAwIBAgIEXozDxjANBgkqhkiG9w0BAQsFADAYMRYwFAYDVQQDDA1s
-b2NhdG9yLW1hZXZlMB4XDTIwMDQwNzE4MTc0MloXDTI1MDQwNzE4MTc0MlowGDEW
-MBQGA1UEAwwNbG9jYXRvci1tYWV2ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAOJ3jM2Rb50L+1fXyhZbaOHMuVUVGJ5jQV9wH3ijjeCEckaF29LbEtG8
-swMaxSoi4Sp/A4dp/7VI9CFZJKOX3zooZcuHyR7GSta4wH3oO55w0AfyTGeG6KF2
-Ekzj8pDPHyn/141rFAUPmMDnCfbF69Uixfi2XPxEJZw2GDN/YIHndY+X1pJ4ZuXS
-SmrORSEOSmrN9X7pqbL5D2cy15cmTK5449ZqLEfZS72Mv3gve1Ax2JMWCBEwLdob
-xW5utgmEe1/WhlhPzFr5C92znF/5Eucil/Rr+yynp31X+/QYBemYwOxbeZotHBZJ
-tMLMzaInydrZ04wgHRftNeN0TIZkPmcCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEA
-Jj1OSCWoILzWLBU1cAiQK8Gt0DVkqcpO4/vc3CoiU2T/em74cBzTwqmgrBvykWgq
-f05jWQcod2yNg8trHrgx8F9CfyyvTXRIxttyfmbD7DAQk+qn9QBSbRJFfzo8VfNp
-dGcT7KV9UDVyzltiTorqQJHUx3acUgtLYS2XUVlbGclhnNafRO44uobOsteAG01v
-YqFa8ZaZM7qcZ88mbbKLXn6lo203JguM+TM0P7wHnzcww9sLmsP8W2cvsvefwCl4
-O7OYcjhcbEph+mIC3/zN8vF6d8xtLiMSGk6BNCHd003MBEhZHizyquGtAFLaEafX
-V6sLm65i8uF2glnQfwS5JQ==
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIICrDCCAZSgAwIBAgIEXozDxjANBgkqhkiG9w0BAQsFADAYMRYwFAYDVQQDDA1s
-b2NhdG9yLW1hZXZlMB4XDTIwMDQwNzE4MTc0MloXDTI1MDQwNzE4MTc0MlowGDEW
-MBQGA1UEAwwNbG9jYXRvci1tYWV2ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAOJ3jM2Rb50L+1fXyhZbaOHMuVUVGJ5jQV9wH3ijjeCEckaF29LbEtG8
-swMaxSoi4Sp/A4dp/7VI9CFZJKOX3zooZcuHyR7GSta4wH3oO55w0AfyTGeG6KF2
-Ekzj8pDPHyn/141rFAUPmMDnCfbF69Uixfi2XPxEJZw2GDN/YIHndY+X1pJ4ZuXS
-SmrORSEOSmrN9X7pqbL5D2cy15cmTK5449ZqLEfZS72Mv3gve1Ax2JMWCBEwLdob
-xW5utgmEe1/WhlhPzFr5C92znF/5Eucil/Rr+yynp31X+/QYBemYwOxbeZotHBZJ
-tMLMzaInydrZ04wgHRftNeN0TIZkPmcCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEA
-Jj1OSCWoILzWLBU1cAiQK8Gt0DVkqcpO4/vc3CoiU2T/em74cBzTwqmgrBvykWgq
-f05jWQcod2yNg8trHrgx8F9CfyyvTXRIxttyfmbD7DAQk+qn9QBSbRJFfzo8VfNp
-dGcT7KV9UDVyzltiTorqQJHUx3acUgtLYS2XUVlbGclhnNafRO44uobOsteAG01v
-YqFa8ZaZM7qcZ88mbbKLXn6lo203JguM+TM0P7wHnzcww9sLmsP8W2cvsvefwCl4
-O7OYcjhcbEph+mIC3/zN8vF6d8xtLiMSGk6BNCHd003MBEhZHizyquGtAFLaEafX
-V6sLm65i8uF2glnQfwS5JQ==
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIICtDCCAZygAwIBAgIEXozGnzANBgkqhkiG9w0BAQsFADAcMRowGAYDVQQDDBFz
-ZXJ2ZXItY2xlbWVudGluZTAeFw0yMDA0MDcxODI5NTFaFw0yNTA0MDcxODI5NTFa
-MBwxGjAYBgNVBAMMEXNlcnZlci1jbGVtZW50aW5lMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEA6IzshjujS5c58AH8nJHBhlqjfNpacoNxhxykeCVsExa9
-vi0l8ezi35pte06j7gpMWhDYHokrHaw6ymp9iTi7D91yIPGeMMNUli8DnzgAzpeY
-V8SGgkrVBalkVe0GimAHXMrzeZF+8D2BEdvDAsIUbrZRACElPlLUoiO93xZZ8ad+
-fAfLVetH4lDJ54FT7ia+St6L0QxSrDLvrqmc/58ZunkQBnQcd4tMjCD1kX4l+5Q1
-eF+Rc/SbY+/8HfyCZcA98voC3dKF13U+0YAf/0ahin+8Ckm6BL/StUxFNftTtJ7l
-iKf56Y3FbSQ84Q9Te8feb05XidkF74Gifa4Q7gOzjwIDAQABMA0GCSqGSIb3DQEB
-CwUAA4IBAQDKvYcnVFryhupo156bB33BU14KN8b5joVyQLeGb2Tx+icZd/jFhqSQ
-c3f8VV+aG9+CtRi/6wesdzf9/CVF+J4ARJ7j3i60NlJi4vQJlZnou+JSBgbBiDkW
-p12ITsw7l1k2zxH8hoMPNbMK1EC/+uwVRJt92L52uShLw9zKtE4MLZxZVa7Amkf4
-zRc78fHwwPXoMjLcQxw+8JRjlciWr/hZccuppXI4qb17l6HAMvW4vCslao0c9pSp
-Opg5Q0PwVXFROIvCANdxNI9ptSrH78Thxh4rggnHs+OZF02D22oTkjquU4Xrar3u
-FXlIS8UmdkqAXGIJf0pqa48aXcqeipRe
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIICrjCCAZagAwIBAgIEXozE5DANBgkqhkiG9w0BAQsFADAZMRcwFQYDVQQDDA5z
-ZXJ2ZXItZG9sb3JlczAeFw0yMDA0MDcxODIyMjhaFw0yNTA0MDcxODIyMjhaMBkx
-FzAVBgNVBAMMDnNlcnZlci1kb2xvcmVzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAyRTzsWsih9Boz2/aRFJsgJNDn8/C207kpvJ9lj0uBWNdZGJ86T4i
-CwvIyMFvxeYQB0qO0AHf6FvJfMgunRlCj3fD01s7AHj8kCFoM/akgo04M7iJfSkU
-dDCVuRbrFtz31akNckyxRw/oORiQ6NYGxnuAvtFdjE8jFc77WVXVU5QuqVEueJXs
-HM+t6VGEn+7GwPsSJMIuEERd+05ZlghB1HoQD4Wu4+b/CXU+8aFRad0HRXHInBl0
-0QABETcMtpe3xIotC7H1nsAMipb0jyl3p+1a49FbrAktsiko8Y2iRVv3kZ58xfx9
-2Unmw+ViEb5bVRFytqb5AIgARI/+XX1zBwIDAQABMA0GCSqGSIb3DQEBCwUAA4IB
-AQB39QXR3HLEju8B1oNCH1UciZetMxvORC2fwgXhqjbJ2YkHlykaLAAKv6DOSyc2
-HE40F2Q/Y0p0NC41+4YIiujgzKWaDI1Gw22PlceE2B49dO8evmldN2NixkirJbtm
-bEtjINAxHXbhXn8GgUKJxSqtFPTX/fG7OCYvkvGItQAhSrGo9r5ACuDYkTZsBAZp
-9jHc50TZsQ7od4jsPXrtZ6S2doOA0TdQ/+XzNyoadbG0YZbRtUVmhJN7gQfkBcjH
-/AnYeYJL1kg39AuO3PsFhgWCsR2eNizGCh7CnHx7xpJnLYAw/01TGidsku/oYFiI
-5SthBjGC992gTekW54hYtMBU
------END CERTIFICATE-----
diff --git a/cppcache/integration/test/sni-test-config/haproxy.cfg b/cppcache/integration/test/sni-test-config/haproxy.cfg
deleted file mode 100644
index c451ef6..0000000
--- a/cppcache/integration/test/sni-test-config/haproxy.cfg
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You 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.
-#
-
-defaults
- timeout client 1000
- timeout connect 1000
- timeout server 1000
-
-frontend sniproxy
- bind *:15443
- mode tcp
- tcp-request inspect-delay 5s
- tcp-request content accept if { req_ssl_hello_type 1 }
- use_backend locators-maeve if { req.ssl_sni -i locator-maeve }
- use_backend servers-dolores if { req.ssl_sni -i server-dolores }
- use_backend servers-clementine if { req.ssl_sni -i server-clementine }
- default_backend locators-maeve
- log stdout format raw local0 debug
-
-backend locators-maeve
- mode tcp
- server locator1 geode:10334
-
-backend servers-dolores
- mode tcp
- server server1 geode:40404
-
-backend servers-clementine
- mode tcp
- server server1 geode:40405
diff --git a/cppcache/integration/test/sni-test-config/scripts/forever b/cppcache/integration/test/sni-test-config/scripts/forever
deleted file mode 100755
index 4fecfa8..0000000
--- a/cppcache/integration/test/sni-test-config/scripts/forever
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env sh
-
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You 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.
-#
-
-while true; do sleep 600; done
diff --git a/cppcache/integration/test/sni-test-config/scripts/geode-starter-2.gfsh b/cppcache/integration/test/sni-test-config/scripts/geode-starter-2.gfsh
deleted file mode 100755
index 38600aa..0000000
--- a/cppcache/integration/test/sni-test-config/scripts/geode-starter-2.gfsh
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You 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.
-#
-
-start locator --name=locator-maeve --hostname-for-clients=locator-maeve --properties-file=/geode/config/gemfire.properties --security-properties-file=/geode/config/gfsecurity.properties --J=-Dgemfire.ssl-keystore=/geode/config/locator-maeve-keystore.jks
-start server --name=server-dolores --group=group-dolores --hostname-for-clients=server-dolores --locators=localhost[10334] --properties-file=/geode/config/gemfire.properties --security-properties-file=/geode/config/gfsecurity.properties --J=-Dgemfire.ssl-keystore=/geode/config/server-dolores-keystore.jks
-start server --name=server-clementine --group=group-clementine --hostname-for-clients=server-clementine --server-port=40405 --locators=localhost[10334] --properties-file=/geode/config/gemfire.properties --security-properties-file=/geode/config/gfsecurity.properties --J=-Dgemfire.ssl-keystore=/geode/config/server-clementine-keystore.jks
-connect --locator=localhost[10334] --use-ssl=true --security-properties-file=/geode/config/gfsecurity.properties
-create region --name=region-dolores --group=group-dolores --type=REPLICATE
-create region --name=region-clementine --group=group-clementine --type=REPLICATE
diff --git a/cppcache/integration/test/sni-test-config/scripts/geode-starter.gfsh b/cppcache/integration/test/sni-test-config/scripts/geode-starter.gfsh
deleted file mode 100755
index 9ceecad..0000000
--- a/cppcache/integration/test/sni-test-config/scripts/geode-starter.gfsh
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You 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.
-#
-
-start locator --name=locator-maeve --hostname-for-clients=locator-maeve --properties-file=/geode/config/gemfire.properties --security-properties-file=/geode/config/gfsecurity.properties --J=-Dgemfire.ssl-keystore=/geode/config/locator-maeve-keystore.jks
-start server --name=server-dolores --max-heap=256m --hostname-for-clients=server-dolores --locators=localhost[10334] --properties-file=/geode/config/gemfire.properties --security-properties-file=/geode/config/gfsecurity.properties --J=-Dgemfire.ssl-keystore=/geode/config/server-dolores-keystore.jks
-connect --locator=localhost[10334] --use-ssl=true --security-properties-file=/geode/config/gfsecurity.properties
-create region --name=jellyfish --type=REPLICATE
-
[geode-native] 02/02: Configure docker based acceptance tests -
Create new acceptance-test folders for cpp and cli - move existing sni
tests to acceptance-test
Posted by mm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mmartell pushed a commit to branch GEODE-8460-docker-available
in repository https://gitbox.apache.org/repos/asf/geode-native.git
commit 3570cb02afa1632ca169c87f9c725dbde2bf933e
Author: Mike Martell <mm...@pivotal.io>
AuthorDate: Fri Aug 28 08:18:17 2020 -0700
Configure docker based acceptance tests
- Create new acceptance-test folders for cpp and cli
- move existing sni tests to acceptance-test
---
CMakeLists.txt | 25 +++++-
clicache/CMakeLists.txt | 4 +
.../CMakeLists.txt | 22 +----
clicache/acceptance-test/Config.cs.in | 46 ++++++++++
.../SNITests.cs | 1 -
clicache/acceptance-test/TestBase.cs | 58 +++++++++++++
clicache/acceptance-test/cache.xml | 41 +++++++++
clicache/acceptance-test/geode.properties | 99 ++++++++++++++++++++++
clicache/acceptance-test/packages.config | 29 +++++++
clicache/acceptance-test/xunit.runner.json | 5 ++
clicache/integration-test2/CMakeLists.txt | 1 -
cppcache/CMakeLists.txt | 5 ++
cppcache/acceptance-test/CMakeLists.txt | 92 ++++++++++++++++++++
.../test => acceptance-test}/SNITest.cpp | 8 --
cppcache/integration/test/CMakeLists.txt | 5 +-
15 files changed, 404 insertions(+), 37 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index baeab6e..428e3f3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -338,8 +338,8 @@ set_target_properties(unit-tests PROPERTIES
add_custom_target(run-unit-tests)
add_dependencies(run-unit-tests unit-tests)
set_target_properties(run-unit-tests PROPERTIES
- EXCLUDE_FROM_ALL TRUE
- EXCLUDE_FROM_DEFAULT_BUILD TRUE
+ EXCLUDE_FROM_ALL TRUE
+ EXCLUDE_FROM_DEFAULT_BUILD TRUE
FOLDER cpp/test/unit
)
@@ -349,13 +349,30 @@ set_target_properties(integration-tests PROPERTIES FOLDER cpp/test/integration)
add_custom_target(run-integration-tests)
add_dependencies(run-integration-tests integration-tests)
set_target_properties(run-integration-tests PROPERTIES
- EXCLUDE_FROM_ALL TRUE
- EXCLUDE_FROM_DEFAULT_BUILD TRUE
+ EXCLUDE_FROM_ALL TRUE
+ EXCLUDE_FROM_DEFAULT_BUILD TRUE
+ FOLDER test-common
+)
+
+add_custom_target(acceptance-tests)
+set_target_properties(acceptance-tests PROPERTIES FOLDER cpp/test/acceptance)
+
+add_custom_target(run-acceptance-tests)
+add_dependencies(run-acceptance-tests acceptance-tests)
+set_target_properties(run-acceptance-tests PROPERTIES
+ EXCLUDE_FROM_ALL TRUE
+ EXCLUDE_FROM_DEFAULT_BUILD TRUE
FOLDER test-common
)
find_package(OpenSSL REQUIRED)
+find_program(DOCKER docker)
+set(DOCKER_PGM ${DOCKER} CACHE INTERNAL "")
+
+find_program(DOCKERCOMPOSE docker-compose)
+set(DOCKERCOMPOSE_PGM ${DOCKERCOMPOSE} CACHE INTERNAL "")
+
add_subdirectory(tests/javaobject)
add_subdirectory(dependencies)
add_subdirectory(cppcache)
diff --git a/clicache/CMakeLists.txt b/clicache/CMakeLists.txt
index 9895a75..9df76a7 100644
--- a/clicache/CMakeLists.txt
+++ b/clicache/CMakeLists.txt
@@ -27,5 +27,9 @@ add_subdirectory(test)
add_subdirectory(test2)
add_subdirectory(integration-test)
add_subdirectory(integration-test2)
+if ((NOT ${DOCKER_PGM} MATCHES "DOCKER_NOTFOUND") AND
+ (NOT ${DOCKERCOMPOSE_PGM} MATCHES "DOCKERCOMPOSE_NOTFOUND"))
+ add_subdirectory(acceptance-test)
+endif()
add_subdirectory(plugins/SQLiteCLI)
diff --git a/clicache/integration-test2/CMakeLists.txt b/clicache/acceptance-test/CMakeLists.txt
similarity index 89%
copy from clicache/integration-test2/CMakeLists.txt
copy to clicache/acceptance-test/CMakeLists.txt
index c41a4d2..2e3aa38 100644
--- a/clicache/integration-test2/CMakeLists.txt
+++ b/clicache/acceptance-test/CMakeLists.txt
@@ -14,7 +14,7 @@
# limitations under the License.
cmake_minimum_required( VERSION 3.9 )
-project( Apache.Geode.IntegrationTests2 CSharp )
+project( Apache.Geode.DockerAcceptanceTests CSharp )
set(CMAKE_CSharp_FLAGS "/langversion:5")
@@ -24,30 +24,13 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/packages.config ${CMAKE_CURRENT_BINAR
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Config.cs.in ${CMAKE_CURRENT_BINARY_DIR}/Config.cs)
add_library( ${PROJECT_NAME} SHARED
- Framework.cs
- Cluster.cs
- ClusterTest.cs
Config.cs.in
${CMAKE_CURRENT_BINARY_DIR}/Config.cs
- GfshTest.cs
- GfshExecuteTest.cs
- Gfsh.cs
- GfshExecute.cs
- CacheXml.cs
- CacheXmlTests.cs
- CqOperationTest.cs
- FunctionExecutionTest.cs
- QueryTest.cs
- RegionTest.cs
- RegionSSLTest.cs
- Position.cs
TestBase.cs
cache.xml
geode.properties
xunit.runner.json
packages.config
- AutoSerializationTests.cs
- SerializationTests.cs
SNITests.cs
)
@@ -64,7 +47,6 @@ set_source_files_properties(
target_link_libraries(${PROJECT_NAME}
PUBLIC
Apache.Geode
- PdxClassLibrary
)
set_target_properties( ${PROJECT_NAME} PROPERTIES
@@ -81,7 +63,7 @@ set_target_properties( ${PROJECT_NAME} PROPERTIES
VS_DOTNET_REFERENCE_xunit.abstractions "${CMAKE_BINARY_DIR}/clicache/packages/xunit.abstractions.2.0.2/lib/net35/xunit.abstractions.dll"
VS_DOTNET_REFERENCE_xunit.execution.desktop "${CMAKE_BINARY_DIR}/clicache/packages/xunit.extensibility.execution.2.4.0/lib/net452/xunit.execution.desktop.dll"
VS_DOTNET_REFERENCE_xunit.runner.visualstudio.testadapter "${CMAKE_BINARY_DIR}/clicache/packages/xunit.runner.visualstudio.2.4.0/build/_common/xunit.runner.visualstudio.testadapter.dll"
- FOLDER cli/test/integration
+ FOLDER cli/test/acceptance
)
if(NOT "${STRONG_NAME_KEY}" STREQUAL "")
diff --git a/clicache/acceptance-test/Config.cs.in b/clicache/acceptance-test/Config.cs.in
new file mode 100644
index 0000000..4111ec2
--- /dev/null
+++ b/clicache/acceptance-test/Config.cs.in
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ */
+
+// GENERATED FROM Config.cs.in DO NOT EDIT Config.cs
+
+public class Config
+{
+ public static string GeodeGfsh
+ {
+ get { return @"@Geode_gfsh_EXECUTABLE@"; }
+ }
+
+ public static string JavaobjectJarPath
+ {
+ get { return @"@JAVAOBJECT_JAR_PATH@"; }
+ }
+
+ public static string SslServerKeyPath
+ {
+ get { return @"@CMAKE_CURRENT_SOURCE_DIR@/../../ssl_keys/server_keys"; }
+ }
+
+ public static string SslClientKeyPath
+ {
+ get { return @"@CMAKE_CURRENT_SOURCE_DIR@/../../ssl_keys/client_keys"; }
+ }
+
+ public static string SniConfigPath
+ {
+ get { return @"@CMAKE_CURRENT_SOURCE_DIR@/../../sni-test-config"; }
+ }
+}
diff --git a/clicache/integration-test2/SNITests.cs b/clicache/acceptance-test/SNITests.cs
similarity index 99%
rename from clicache/integration-test2/SNITests.cs
rename to clicache/acceptance-test/SNITests.cs
index f23818b..0dbf148 100644
--- a/clicache/integration-test2/SNITests.cs
+++ b/clicache/acceptance-test/SNITests.cs
@@ -19,7 +19,6 @@ using System;
using System.Diagnostics;
using System.IO;
using Xunit;
-using PdxTests;
using System.Collections;
using System.Collections.Generic;
using Xunit.Abstractions;
diff --git a/clicache/acceptance-test/TestBase.cs b/clicache/acceptance-test/TestBase.cs
new file mode 100644
index 0000000..fe5b87e
--- /dev/null
+++ b/clicache/acceptance-test/TestBase.cs
@@ -0,0 +1,58 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ */
+
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Reflection;
+using Xunit;
+using Xunit.Abstractions;
+using Xunit.Sdk;
+
+namespace Apache.Geode.Client.IntegrationTests
+{
+ [Trait("Category", "Integration")]
+ public class TestBase
+ {
+ protected ITest currentTest;
+ protected ITestOutputHelper output;
+
+ public TestBase(ITestOutputHelper testOutputHelper)
+ {
+ var helper = (TestOutputHelper)testOutputHelper;
+
+ ITest test = (ITest)helper.GetType().GetField("test", BindingFlags.NonPublic | BindingFlags.Instance)
+ .GetValue(helper);
+
+ currentTest = test;
+ output = testOutputHelper;
+ }
+
+ public void CleanTestCaseDirectory(string directory)
+ {
+ if (Directory.Exists(directory))
+ {
+ Directory.Delete(directory, true);
+ }
+ }
+
+ public string CreateTestCaseDirectoryName()
+ {
+ return currentTest.TestCase.TestMethod.Method.Name;
+ }
+ }
+}
diff --git a/clicache/acceptance-test/cache.xml b/clicache/acceptance-test/cache.xml
new file mode 100644
index 0000000..9840108
--- /dev/null
+++ b/clicache/acceptance-test/cache.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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.
+-->
+<client-cache
+ xmlns="http://geode.apache.org/schema/cache"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://geode.apache.org/schema/cache
+ http://geode.apache.org/schema/cache/cpp-cache-1.0.xsd"
+ version="9.0">
+
+ <pool name="default">
+ <locator host="localhost" port="LOCATOR_PORT"/>
+ </pool>
+
+ <region name = "REGION_NAME" >
+ <region-attributes refid="PROXY" pool-name="default" />
+ </region>
+
+ <region name = "testRegion1" >
+ <region-attributes refid="PROXY" pool-name="default" />
+ </region>
+
+ <region name = "testRegion2" >
+ <region-attributes refid="PROXY" pool-name="default" />
+ </region>
+
+</client-cache>
\ No newline at end of file
diff --git a/clicache/acceptance-test/geode.properties b/clicache/acceptance-test/geode.properties
new file mode 100644
index 0000000..e43c71a
--- /dev/null
+++ b/clicache/acceptance-test/geode.properties
@@ -0,0 +1,99 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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.
+# Default Geode C++ distributed system properties
+# Copy to current directory and uncomment to override defaults.
+#
+## Debugging support, enables stacktraces in apache::geode::client::Exception.
+#
+# The default is false, uncomment to enable stacktraces in exceptions.
+#stacktrace-enabled=true
+#crash-dump-enabled=true
+#
+#
+## Cache region configurtion
+#
+#cache-xml-file=cache.xml
+#
+## Log file config
+#
+#log-file=gemfire_cpp.log
+#log-level=debug
+# zero indicates use no limit.
+#log-file-size-limit=0
+# zero indicates use no limit.
+#log-disk-space-limit=0
+#
+## Statistics values
+#
+# the rate is in seconds.
+#statistic-sample-rate=1
+#statistic-sampling-enabled=true
+#statistic-archive-file=statArchive.gfs
+# zero indicates use no limit.
+#archive-file-size-limit=0
+# zero indicates use no limit.
+#archive-disk-space-limit=0
+#enable-time-statistics=false
+#
+## Heap based eviction configuration
+#
+# maximum amount of memory used by the cache for all regions, 0 disables this feature
+#heap-lru-limit=0
+# percentage over heap-lru-limit when LRU will be called.
+#heap-lru-delta=10
+#
+## Durable client support
+#
+#durable-client-id=
+durable-timeout=12345s
+#
+## SSL socket support
+#
+#ssl-enabled=false
+#ssl-keystore=
+#ssl-keystore-password=
+#ssl-truststore=
+#
+## .NET AppDomain support
+#
+#appdomain-enabled=false
+#
+## Misc
+#
+#conflate-events=server
+#disable-shuffling-of-endpoints=false
+#grid-client=false
+#max-fe-threads=
+#max-socket-buffer-size=66560
+# the units are in seconds.
+#connect-timeout=59
+#notify-ack-interval=10
+#notify-dupcheck-life=300
+#ping-interval=10
+#redundancy-monitor-interval=10
+#auto-ready-for-events=true
+#suspended-tx-timeout=30
+#enable-chunk-handler-thread=false
+#tombstone-timeout=480000
+#
+## module name of the initializer pointing to sample
+## implementation from templates/security
+#security-client-auth-library=securityImpl
+## static method name of the library mentioned above
+#security-client-auth-factory=createUserPasswordAuthInitInstance
+## credential for Dummy Authenticator configured in server.
+## note: security-password property will be inserted by the initializer
+## mentioned in the above property.
+#security-username=root
diff --git a/clicache/acceptance-test/packages.config b/clicache/acceptance-test/packages.config
new file mode 100644
index 0000000..e7d725b
--- /dev/null
+++ b/clicache/acceptance-test/packages.config
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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.
+-->
+<packages>
+ <package id="Microsoft.VisualStudio.TestPlatform" version="14.0.0.1" targetFramework="net452" />
+ <package id="xunit" version="2.4.0" targetFramework="net452" />
+ <package id="xunit.abstractions" version="2.0.2" targetFramework="net35" />
+ <package id="xunit.analyzers" version="0.10.0" targetFramework="net452" />
+ <package id="xunit.assert" version="2.4.0" targetFramework="net452" />
+ <package id="xunit.core" version="2.4.0" targetFramework="net452" />
+ <package id="xunit.extensibility.core" version="2.4.0" targetFramework="net452" />
+ <package id="xunit.extensibility.execution" version="2.4.0" targetFramework="net452" />
+ <package id="xunit.runner.console" version="2.4.0" targetFramework="net452" developmentDependency="true" />
+ <package id="xunit.runner.visualstudio" version="2.4.0" targetFramework="net452" developmentDependency="true" />
+</packages>
diff --git a/clicache/acceptance-test/xunit.runner.json b/clicache/acceptance-test/xunit.runner.json
new file mode 100644
index 0000000..16ea334
--- /dev/null
+++ b/clicache/acceptance-test/xunit.runner.json
@@ -0,0 +1,5 @@
+{
+ "methodDisplay": "classAndMethod",
+ "parallelizeAssembly": true,
+ "parallelizeTestCollections": true
+}
diff --git a/clicache/integration-test2/CMakeLists.txt b/clicache/integration-test2/CMakeLists.txt
index c41a4d2..3437621 100644
--- a/clicache/integration-test2/CMakeLists.txt
+++ b/clicache/integration-test2/CMakeLists.txt
@@ -48,7 +48,6 @@ add_library( ${PROJECT_NAME} SHARED
packages.config
AutoSerializationTests.cs
SerializationTests.cs
- SNITests.cs
)
set_source_files_properties(
diff --git a/cppcache/CMakeLists.txt b/cppcache/CMakeLists.txt
index eecd64e..0e4126e 100644
--- a/cppcache/CMakeLists.txt
+++ b/cppcache/CMakeLists.txt
@@ -116,6 +116,11 @@ add_subdirectory(internal)
add_subdirectory(integration)
add_subdirectory(integration-test)
+if ((NOT ${DOCKER_PGM} MATCHES "DOCKER_NOTFOUND") AND
+ (NOT ${DOCKERCOMPOSE_PGM} MATCHES "DOCKERCOMPOSE_NOTFOUND"))
+ add_subdirectory(acceptance-test)
+endif()
+
if (BUILD_BENCHMARKS)
add_subdirectory(benchmark)
endif()
diff --git a/cppcache/acceptance-test/CMakeLists.txt b/cppcache/acceptance-test/CMakeLists.txt
new file mode 100644
index 0000000..e62d8a8
--- /dev/null
+++ b/cppcache/acceptance-test/CMakeLists.txt
@@ -0,0 +1,92 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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.
+
+add_executable(cpp-acceptance-test
+ SNITest.cpp
+)
+
+target_compile_definitions(cpp-acceptance-test
+ PUBLIC
+ GTEST_ELLIPSIS_NEEDS_POD_
+)
+
+target_include_directories(cpp-acceptance-test
+ PUBLIC
+ ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+target_link_libraries(cpp-acceptance-test
+ PUBLIC
+ apache-geode
+ integration-framework
+ testobject
+ ACE::ACE
+ GTest::gtest
+ GTest::gtest_main
+ Boost::boost
+ Boost::system
+ Boost::log
+ Boost::filesystem
+ Boost::chrono
+ PRIVATE
+ _WarningsAsError
+ internal
+)
+
+if(WIN32)
+ foreach (_target apache-geode testobject)
+ add_custom_command(TARGET cpp-acceptance-test
+ DEPENDS ${_target}
+ COMMAND ${CMAKE_COMMAND} -E copy_if_different
+ "$<TARGET_FILE:${_target}>"
+ "$<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:$<TARGET_PDB_FILE:${_target}>>"
+ "$<TARGET_FILE_DIR:cpp-acceptance-test>")
+ endforeach()
+endif()
+
+# file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/sni-test-config DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+
+set_target_properties(cpp-acceptance-test PROPERTIES
+ CXX_VISIBILITY_PRESET hidden
+ VISIBILITY_INLINES_HIDDEN ON
+ FOLDER cpp/test/acceptance
+)
+
+add_clangformat(cpp-acceptance-test)
+
+enable_testing()
+include(GoogleTest)
+gtest_discover_tests(cpp-acceptance-test
+ DISCOVERY_TIMEOUT 60
+)
+
+file(GLOB SSL_CERTIFICATES
+ "${CMAKE_CURRENT_SOURCE_DIR}/*Keys"
+ )
+
+file(INSTALL ${SSL_CERTIFICATES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+
+add_custom_target(run-cpp-acceptance-test
+ DEPENDS $<TARGET_FILE:cpp-acceptance-test>
+ COMMAND ctest -C $<CONFIG>
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+ USES_TERMINAL
+)
+add_dependencies(run-acceptance-tests run-cpp-acceptance-test)
+set_target_properties(run-cpp-acceptance-test PROPERTIES
+ EXCLUDE_FROM_ALL TRUE
+ EXCLUDE_FROM_DEFAULT_BUILD TRUE
+ FOLDER cpp/test/acceptance
+)
diff --git a/cppcache/integration/test/SNITest.cpp b/cppcache/acceptance-test/SNITest.cpp
similarity index 97%
rename from cppcache/integration/test/SNITest.cpp
rename to cppcache/acceptance-test/SNITest.cpp
index 0232bc6..6d28681 100644
--- a/cppcache/integration/test/SNITest.cpp
+++ b/cppcache/acceptance-test/SNITest.cpp
@@ -117,11 +117,7 @@ class SNITest : public ::testing::Test {
boost::filesystem::path sniConfigPath;
};
-#if defined(_WIN32)
-TEST_F(SNITest, DISABLED_connectViaProxyTest) {
-#else
TEST_F(SNITest, connectViaProxyTest) {
-#endif
const auto clientTruststore =
(clientSslKeysDir / boost::filesystem::path("/truststore_sni.pem"));
@@ -150,11 +146,7 @@ TEST_F(SNITest, connectViaProxyTest) {
cache.close();
}
-#if defined(_WIN32)
-TEST_F(SNITest, DISABLE_connectWithoutProxyFails) {
-#else
TEST_F(SNITest, connectWithoutProxyFails) {
-#endif
const auto clientTruststore =
(clientSslKeysDir / boost::filesystem::path("/truststore_sni.pem"));
diff --git a/cppcache/integration/test/CMakeLists.txt b/cppcache/integration/test/CMakeLists.txt
index f5c3a06..f11fc67 100644
--- a/cppcache/integration/test/CMakeLists.txt
+++ b/cppcache/integration/test/CMakeLists.txt
@@ -42,7 +42,6 @@ add_executable(cpp-integration-test
SimpleAuthInitialize.hpp
SimpleCqListener.cpp
SimpleCqListener.hpp
- SNITest.cpp
SslOneWayTest.cpp
SslTwoWayTest.cpp
StructTest.cpp
@@ -97,7 +96,7 @@ configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/func_cacheserver2_pool.xml
${CMAKE_CURRENT_BINARY_DIR}/func_cacheserver2_pool.xml COPYONLY)
- file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/sni-test-config DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+#file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/sni-test-config DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
set_target_properties(cpp-integration-test PROPERTIES
CXX_VISIBILITY_PRESET hidden
@@ -117,7 +116,7 @@ file(GLOB SSL_CERTIFICATES
"${CMAKE_CURRENT_SOURCE_DIR}/*Keys"
)
-file(INSTALL ${SSL_CERTIFICATES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+#file(INSTALL ${SSL_CERTIFICATES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
add_custom_target(run-cpp-integration-test
DEPENDS $<TARGET_FILE:cpp-integration-test>