projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '9486-retry-instance-limit-exceeded' closes #9486
[arvados.git]
/
services
/
api
/
test
/
unit
/
app_version_test.rb
diff --git
a/services/api/test/unit/app_version_test.rb
b/services/api/test/unit/app_version_test.rb
index eaf9cbb4ade77d7e6d49f30cd4fbdec44da3955d..3e9b16757dbf8af4750ea21402b78a752202c54e 100644
(file)
--- a/
services/api/test/unit/app_version_test.rb
+++ b/
services/api/test/unit/app_version_test.rb
@@
-8,7
+8,7
@@
class AppVersionTest < ActiveSupport::TestCase
test 'invoke git processes only on first call' do
AppVersion.expects(:git).
test 'invoke git processes only on first call' do
AppVersion.expects(:git).
- with("status", "-
s
").once.
+ with("status", "-
-porcelain
").once.
yields " M services/api/README\n"
AppVersion.expects(:git).
with("log", "-n1", "--format=%H").once.
yields " M services/api/README\n"
AppVersion.expects(:git).
with("log", "-n1", "--format=%H").once.
@@
-29,7
+29,8
@@
class AppVersionTest < ActiveSupport::TestCase
test 'override with file' do
path = Rails.root.join 'git-commit.version'
test 'override with file' do
path = Rails.root.join 'git-commit.version'
- assert !File.exists?(path)
+ assert(!File.exists?(path),
+ "Packaged version file found in source tree: #{path}")
begin
File.open(path, 'w') do |f|
f.write "0.1.abc123\n"
begin
File.open(path, 'w') do |f|
f.write "0.1.abc123\n"