summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Rodríguez <deivid.rodriguez@riseup.net>2020-03-04 17:01:37 +0100
committerDavid Rodríguez <deivid.rodriguez@riseup.net>2020-03-04 18:27:46 +0100
commitd36920f40dae8bb0cda7f4c14fc32fe30ea7fe0e (patch)
treeb889ed482088d34e43af469da285c7741a6ad024
parent02c39dd8eef95941d1dcfe8fc11ab469ba2670b3 (diff)
downloadbundler-d36920f40dae8bb0cda7f4c14fc32fe30ea7fe0e.tar.gz
Restore sudo configuration after sudo specsfix_sudo_specs_env
-rw-r--r--Rakefile11
1 files changed, 7 insertions, 4 deletions
diff --git a/Rakefile b/Rakefile
index 814a23492c..4a17296ee7 100644
--- a/Rakefile
+++ b/Rakefile
@@ -57,15 +57,18 @@ namespace :spec do
desc "Run the spec suite with the sudo tests"
task :sudo => %w[set_sudo] do
require "open3"
+ output, status = Open3.capture2e("sudo", "cp", "/etc/sudoers", "tmp/old_sudoers")
+ raise "Couldn't read sudoers file: #{output}" unless status.success?
- output, status = Open3.capture2e("sudo sed -i '/secure_path/d' /etc/sudoers")
- raise "Couldn't configure sudo to preserve path: #{output}" unless status.success?
+ begin
+ output, status = Open3.capture2e("sudo sed -i '/secure_path/d' /etc/sudoers")
+ raise "Couldn't configure sudo to preserve path: #{output}" unless status.success?
- raise "Couldn't configure sudo correctly to preserve path" unless `ruby -v` == `sudo -E ruby -v`
+ raise "Couldn't configure sudo correctly to preserve path" unless `ruby -v` == `sudo -E ruby -v`
- begin
sh("sudo -E bin/rspec")
ensure
+ system("sudo", "cp", "tmp/old_sudoers", "/etc/sudoers")
system("sudo", "chown", "-R", ENV["USER"], "tmp")
end
end