Skip to content

Commit 8d4ced7

Browse files
committed
test(config_spec): avoid use of HOSTNAME_PLACEHOLDER
1 parent 901188d commit 8d4ced7

File tree

5 files changed

+5
-8
lines changed

5 files changed

+5
-8
lines changed

kitchen.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,8 @@ verifier:
149149

150150
suites:
151151
- name: default
152+
driver:
153+
hostname: example.net
152154
provisioner:
153155
state_top:
154156
base:

test/integration/default/controls/config_spec.rb

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,6 @@
9595
server_xml_file = "#{conf_dir}/server.xml"
9696
server_xml_path = "server_xml/#{platform_finger}.xml"
9797
server_xml = inspec.profile.file(server_xml_path)
98-
# Need the hostname to be used for `tomcat.cluster`
99-
server_xml = server_xml.gsub(
100-
'HOSTNAME_PLACEHOLDER',
101-
file('/etc/hostname').content.chomp
102-
)
10398

10499
describe file(server_xml_file) do
105100
it { should be_file }

test/integration/default/files/server_xml/amazonlinux-2.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
/>
9393

9494

95-
<Engine name="Catalina" defaultHost="localhost" jvmRoute="HOSTNAME_PLACEHOLDER">
95+
<Engine name="Catalina" defaultHost="localhost" jvmRoute="example.net">
9696

9797
<Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster" channelSendOptions="8">
9898
<Manager className="org.apache.catalina.ha.session.DeltaManager" expireSessionsOnShutdown="false" notifyListenersOnReplication="true"/>

test/integration/default/files/server_xml/centos-7.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
/>
9393

9494

95-
<Engine name="Catalina" defaultHost="localhost" jvmRoute="HOSTNAME_PLACEHOLDER">
95+
<Engine name="Catalina" defaultHost="localhost" jvmRoute="example.net">
9696

9797
<Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster" channelSendOptions="8">
9898
<Manager className="org.apache.catalina.ha.session.DeltaManager" expireSessionsOnShutdown="false" notifyListenersOnReplication="true"/>

test/integration/default/files/server_xml/debian-8.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
/>
9393

9494

95-
<Engine name="Catalina" defaultHost="localhost" jvmRoute="HOSTNAME_PLACEHOLDER">
95+
<Engine name="Catalina" defaultHost="localhost" jvmRoute="example.net">
9696

9797
<Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster" channelSendOptions="8">
9898
<Manager className="org.apache.catalina.ha.session.DeltaManager" expireSessionsOnShutdown="false" notifyListenersOnReplication="true"/>

0 commit comments

Comments
 (0)