Run tests with HOMEBREW_DEVELOPER
unset.
This commit is contained in:
parent
ae7ee0a44c
commit
7a991985a4
@ -51,8 +51,10 @@ begin
|
|||||||
internal_dev_cmd = require? HOMEBREW_LIBRARY_PATH/"dev-cmd"/cmd
|
internal_dev_cmd = require? HOMEBREW_LIBRARY_PATH/"dev-cmd"/cmd
|
||||||
internal_cmd = internal_dev_cmd
|
internal_cmd = internal_dev_cmd
|
||||||
if internal_dev_cmd && !ARGV.homebrew_developer?
|
if internal_dev_cmd && !ARGV.homebrew_developer?
|
||||||
|
if (HOMEBREW_REPOSITORY/".git/config").exist?
|
||||||
system "git", "config", "--file=#{HOMEBREW_REPOSITORY}/.git/config",
|
system "git", "config", "--file=#{HOMEBREW_REPOSITORY}/.git/config",
|
||||||
"--replace-all", "homebrew.devcmdrun", "true"
|
"--replace-all", "homebrew.devcmdrun", "true"
|
||||||
|
end
|
||||||
ENV["HOMEBREW_DEV_CMD_RUN"] = "1"
|
ENV["HOMEBREW_DEV_CMD_RUN"] = "1"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -43,8 +43,8 @@ module Homebrew
|
|||||||
ENV.delete("HOMEBREW_TEMP")
|
ENV.delete("HOMEBREW_TEMP")
|
||||||
ENV.delete("HOMEBREW_NO_GITHUB_API")
|
ENV.delete("HOMEBREW_NO_GITHUB_API")
|
||||||
ENV.delete("HOMEBREW_NO_EMOJI")
|
ENV.delete("HOMEBREW_NO_EMOJI")
|
||||||
|
ENV.delete("HOMEBREW_DEVELOPER")
|
||||||
ENV["HOMEBREW_NO_ANALYTICS_THIS_RUN"] = "1"
|
ENV["HOMEBREW_NO_ANALYTICS_THIS_RUN"] = "1"
|
||||||
ENV["HOMEBREW_DEVELOPER"] = "1"
|
|
||||||
ENV["HOMEBREW_NO_COMPAT"] = "1" if args.no_compat?
|
ENV["HOMEBREW_NO_COMPAT"] = "1" if args.no_compat?
|
||||||
ENV["HOMEBREW_TEST_GENERIC_OS"] = "1" if args.generic?
|
ENV["HOMEBREW_TEST_GENERIC_OS"] = "1" if args.generic?
|
||||||
ENV["HOMEBREW_TEST_ONLINE"] = "1" if args.online?
|
ENV["HOMEBREW_TEST_ONLINE"] = "1" if args.online?
|
||||||
|
@ -42,6 +42,8 @@ describe Homebrew do
|
|||||||
|
|
||||||
describe "::handle_unsatisfied_dependents" do
|
describe "::handle_unsatisfied_dependents" do
|
||||||
specify "when developer" do
|
specify "when developer" do
|
||||||
|
ENV["HOMEBREW_DEVELOPER"] = "1"
|
||||||
|
|
||||||
expect {
|
expect {
|
||||||
described_class.handle_unsatisfied_dependents(opts)
|
described_class.handle_unsatisfied_dependents(opts)
|
||||||
}.to output(/Warning/).to_stderr
|
}.to output(/Warning/).to_stderr
|
||||||
@ -50,19 +52,16 @@ describe Homebrew do
|
|||||||
end
|
end
|
||||||
|
|
||||||
specify "when not developer" do
|
specify "when not developer" do
|
||||||
run_as_not_developer do
|
|
||||||
expect {
|
expect {
|
||||||
described_class.handle_unsatisfied_dependents(opts)
|
described_class.handle_unsatisfied_dependents(opts)
|
||||||
}.to output(/Error/).to_stderr
|
}.to output(/Error/).to_stderr
|
||||||
|
|
||||||
expect(described_class).to have_failed
|
expect(described_class).to have_failed
|
||||||
end
|
end
|
||||||
end
|
|
||||||
|
|
||||||
specify "when not developer and --ignore-dependencies is specified" do
|
specify "when not developer and --ignore-dependencies is specified" do
|
||||||
ARGV << "--ignore-dependencies"
|
ARGV << "--ignore-dependencies"
|
||||||
|
|
||||||
run_as_not_developer do
|
|
||||||
expect {
|
expect {
|
||||||
described_class.handle_unsatisfied_dependents(opts)
|
described_class.handle_unsatisfied_dependents(opts)
|
||||||
}.not_to output.to_stderr
|
}.not_to output.to_stderr
|
||||||
@ -71,4 +70,3 @@ describe Homebrew do
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
|
||||||
|
@ -118,18 +118,6 @@ describe "globally-scoped helper methods" do
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
describe "#run_as_not_developer" do
|
|
||||||
it "temporarily unsets HOMEBREW_DEVELOPER" do
|
|
||||||
ENV["HOMEBREW_DEVELOPER"] = "foo"
|
|
||||||
|
|
||||||
run_as_not_developer do
|
|
||||||
expect(ENV["HOMEBREW_DEVELOPER"]).to be nil
|
|
||||||
end
|
|
||||||
|
|
||||||
expect(ENV["HOMEBREW_DEVELOPER"]).to eq("foo")
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
describe "#which" do
|
describe "#which" do
|
||||||
let(:cmd) { dir/"foo" }
|
let(:cmd) { dir/"foo" }
|
||||||
|
|
||||||
|
@ -296,12 +296,6 @@ def with_custom_locale(locale)
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def run_as_not_developer
|
|
||||||
with_env(HOMEBREW_DEVELOPER: nil) do
|
|
||||||
yield
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
# Kernel.system but with exceptions
|
# Kernel.system but with exceptions
|
||||||
def safe_system(cmd, *args, **options)
|
def safe_system(cmd, *args, **options)
|
||||||
return if Homebrew.system(cmd, *args, **options)
|
return if Homebrew.system(cmd, *args, **options)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user