xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2026-10-21 07:08:12 +00:00
Code Issues Releases Wiki Activity

test(packaging): cover saved Apache defaults and config roots

Browse Source 
Signed-off-by: Vinícius Ferrão <2031761+viniciusferrao@users.noreply.github.com>
This commit is contained in:
Vinícius Ferrão
2026-10-11 11:41:45 -03:00
parent ee6859d903
commit e41710a675
2 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xCAT-test/fixtures/package-lifecycle/legacy-apache.spec
+5 -4
View File
@@ -7,19 +7,20 @@ Epoch: 4
Summary: Legacy Apache configuration ownership fixture
License: EPL
BuildArch: noarch
%{!?test_httpconfigdir:%global test_httpconfigdir xcat}
%description
Ordinary payload and saved defaults from before configuration-file ownership.
%install
mkdir -p %{buildroot}/etc/httpd/conf.d %{buildroot}/etc/apache2/conf.d %{buildroot}/etc/xcat/conf.orig
mkdir -p %{buildroot}/etc/httpd/conf.d %{buildroot}/etc/apache2/conf.d %{buildroot}/etc/%{test_httpconfigdir}/conf.orig
printf '# recorded payload\n' > %{buildroot}/etc/httpd/conf.d/xcat.conf
printf '# recorded payload\n' > %{buildroot}/etc/apache2/conf.d/xcat.conf
printf '# prior Apache 2.4 default\n' > %{buildroot}/etc/xcat/conf.orig/xcat.conf.apach24
printf '# prior Apache 2.2 default\n' > %{buildroot}/etc/xcat/conf.orig/xcat.conf.apach22
printf '# prior Apache 2.4 default\n' > %{buildroot}/etc/%{test_httpconfigdir}/conf.orig/xcat.conf.apach24
printf '# prior Apache 2.2 default\n' > %{buildroot}/etc/%{test_httpconfigdir}/conf.orig/xcat.conf.apach22
%files
%defattr(-,root,root)
/etc/httpd/conf.d/xcat.conf
/etc/apache2/conf.d/xcat.conf
/etc/xcat/conf.orig
/etc/%{test_httpconfigdir}/conf.orig
xCAT-test/native/apache_rpm_configuration.t
+21 -6
View File
@@ -17,23 +17,34 @@ sub succeeds {
}
for my $package (qw(xCAT xCATsn)) {
my $old_rpm = XCAT::Test::RPM->build_fixture('legacy-apache', '--define', "test_package $package");
for my $target (
my @targets = (
['el-modern', 'xcat.conf.apach24', '--define', 'rhel 8'],
['el-legacy', 'xcat.conf', '--define', 'rhel 6'],
['suse-modern', 'xcat.conf.apach24', '--define', 'rhel 0', '--define', 'suse_version 1500'],
) {
);
push @targets, ['s390x-config', 'xcat.conf.apach24', '--define', 'rhel 8'] if $package eq 'xCAT';
for my $target (@targets) {
my ($label, $source, @defines) = @$target;
local $ENV{s390x} = $label eq 's390x-config' ? 1 : 0;
my $configdir = $ENV{s390x} ? 'xcathttpdsave' : 'xcat';
my $old_rpm = XCAT::Test::RPM->build_fixture('legacy-apache',
'--define', "test_package $package", '--define', "test_httpconfigdir $configdir");
my $rpm = XCAT::Test::RPM->build($package, 1, @defines);
my $expected = slurp_repo_file("xCAT/$source");
for my $state (qw(default24 default22 edited absent symlink fresh)) {
for my $state (qw(default24 default22 edited absent symlink fresh missing24 missing22 missing-both)) {
subtest "$package $label $state configuration" => sub {
my $root = XCAT::Test::RPM->new;
$root->write('/opt/xcat/sbin/xcatconfig', "#!/bin/sh\nexit 0\n", 0755);
$root->write('/opt/xcat/share/xcat/scripts/xHRM', '');
succeeds('install legacy ownership fixture', $root->install($old_rpm)) unless $state eq 'fresh';
my $prior = $state eq 'default22' ? "# prior Apache 2.2 default\n" : "# prior Apache 2.4 default\n";
$root->write('/etc/xcat/conf.orig/xcat.conf.apach24', $prior) if $state eq 'fresh';
$root->write("/etc/$configdir/conf.orig/xcat.conf.apach24", $prior) if $state eq 'fresh';
for my $generation (24, 22) {
if ($state eq "missing$generation" || $state eq 'missing-both') {
unlink $root->path("/etc/$configdir/conf.orig/xcat.conf.apach$generation") or die "unlink template: $!";
}
}
$root->write('/etc/httpd/conf.d/administrator.conf', "unrelated configuration\n");
for my $daemon (qw(httpd apache2)) {
my $active = "/etc/$daemon/conf.d/xcat.conf";
if ($state eq 'absent' || $state eq 'symlink') {
@@ -51,7 +62,8 @@ for my $package (qw(xCAT xCATsn)) {
my $active = "/etc/$daemon/conf.d/xcat.conf";
ok(-e $root->path($active), "$daemon has active configuration");
next unless -e $root->path($active);
if ($state eq 'edited' || $state eq 'symlink' || $state eq 'fresh') {
if ($state eq 'edited' || $state eq 'symlink' || $state eq 'fresh' ||
$state eq 'missing24' || $state eq 'missing-both') {
is($root->read($active), $state eq 'edited' ? "# administrator configuration\n" : $prior, "$daemon retains local bytes");
ok(-f $root->path("$active.rpmnew"), "$daemon receives a separate package default");
is($root->read("$active.rpmnew"), $expected, "$daemon rpmnew has selected Apache syntax") if -f $root->path("$active.rpmnew");
@@ -61,7 +73,10 @@ for my $package (qw(xCAT xCATsn)) {
ok(!-e $root->path("$active.rpmnew"), "$daemon default is active without an rpmnew");
}
ok(!-e $root->path("$active.rpmsave"), "$daemon does not leave an rpmsave on upgrade");
is((stat($root->path($active)))[2] & 07777, 0644, "$daemon retains configuration permissions");
}
is($root->read('/etc/httpd/conf.d/administrator.conf'), "unrelated configuration\n",
'unrelated administrator configuration is unchanged');
};
}
}