Remove links from fixtures

yast · Jan 10, 2018 · 7c4615b · 7c4615b
1 parent abfe81c
commit 7c4615b
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/package/yast2-registration.changes b/package/yast2-registration.changes
@@ -3,6 +3,7 @@ Wed Jan 10 14:36:51 UTC 2018 - igonzalezsosa@suse.com
 
 - Fix initialization to copy the profile to /tmp/profile again
   (bsc#1075334)
+- Fix package build (dropping symlinks under test/fixtures/anchors)
 - 4.0.15
 
 -------------------------------------------------------------------

diff --git a/test/fixtures/anchors/8820a2e8.0 b/test/fixtures/anchors/8820a2e8.0
diff --git a/test/fixtures/anchors/8f13f82e.0 b/test/fixtures/anchors/8f13f82e.0
diff --git a/test/ssl_certificate_spec.rb b/test/ssl_certificate_spec.rb
@@ -55,10 +55,13 @@
       stub_const("Registration::SslCertificate::CA_CERTS_DIR", ca_dir.to_s)
       allow(Yast::Execute).to receive(:locally).and_call_original
       allow(FileUtils).to receive(:rm_rf).and_call_original
+      CERT_LINKS.each { |l| FileUtils.ln_sf(tmp_ca_dir.join(CERT_NAME), tmp_ca_dir.join(l)) }
     end
 
     after do
       FileUtils.rm_rf(ca_dir.to_s)
+      cert_links = tmp_ca_dir.children.select(&:symlink?)
+      FileUtils.rm(cert_links) unless cert_links.empty?
     end
 
     it "adds new certs under anchors to system CA certificates" do