Skip to content

Commit c9e498f

Browse files
committed
Update the archive to use env(1) to find bash(1)
The commits are referenced in a few places in the test suite, so replace the old latest commit by the new latest one.
1 parent b2834b5 commit c9e498f

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed
13 KB
Binary file not shown.

spec/octocatalog-diff/integration/cached_master_dir_spec.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,14 +85,14 @@
8585
it 'should produce log messages indicating the dirctory is being cached' do
8686
expect(@result[:logs]).to match(/Begin bootstrap cached master directory/)
8787
expect(@result[:logs]).to match(/Success bootstrap cached master directory/)
88-
expect(@result[:logs]).to match(/Cached master directory bootstrapped to 948b3874f5af7f91a5f370e306731fec048fa62e/)
88+
expect(@result[:logs]).to match(/Cached master directory bootstrapped to ff1928f3f8d9295c3f26b1de70977ed3eea9329e/)
8989
expect(@result[:logs]).to match(/Cached master catalog for rspec-node.github.net/)
9090
end
9191

9292
it 'should store the SHA in the cached directory' do
9393
sha_file = File.join(@cached_master_dir, '.catalog-diff-master.sha')
9494
expect(File.file?(sha_file)).to eq(true), `ls -lRa "#{@cached_master_dir}"`
95-
expect(File.read(sha_file)).to eq('948b3874f5af7f91a5f370e306731fec048fa62e')
95+
expect(File.read(sha_file)).to eq('ff1928f3f8d9295c3f26b1de70977ed3eea9329e')
9696
end
9797

9898
it 'should store the catalog in the cached directory' do
@@ -130,7 +130,7 @@
130130
expect(result[:diffs].size).to eq(5)
131131

132132
# Examine log messages to ensure that cached catalog was used
133-
expect(result[:logs]).to match(/Cached master dir: bootstrapped=948b3\w+; current=948b3874f5af7f91a5f370e30\w+/)
133+
expect(result[:logs]).to match(/Cached master dir: bootstrapped=ff192\w+; current=ff1928f3f8d9295c3f26b1de7\w+/)
134134
expect(result[:logs]).to match(/Setting --bootstrapped-from-dir=/)
135135
expect(result[:logs]).to match(%r{Setting --from-catalog=.*/.catalogs/rspec-node.github.net.json})
136136
expect(result[:logs]).to match(/Initialized OctocatalogDiff::Catalog::JSON for from-catalog/)
@@ -167,7 +167,7 @@
167167
expect(result[:exitcode]).to eq(-1)
168168
expect(result[:exception]).to be_a_kind_of(Errno::EEXIST)
169169
expect(result[:exception].message).to match(/To proceed, .* needs to be deleted, so it can be re-created/)
170-
expect(result[:logs]).to match(/bootstrapped=asdlfkjadfsklj; current=948b3874f5af7f91a5f370e306731fec048fa62e/)
170+
expect(result[:logs]).to match(/bootstrapped=asdlfkjadfsklj; current=ff1928f3f8d9295c3f26b1de70977ed3eea9329e/)
171171
end
172172

173173
it 'should rebuild the cached catalog when the sha changes' do
@@ -208,11 +208,11 @@
208208
expect(result[:diffs].size).to eq(5)
209209

210210
# Examine log messages to ensure that cached catalog was not used
211-
expect(result[:logs]).to match(/Cached master dir: bootstrapped=asdlfkjadfsklj; current=948b3874f5af7/)
211+
expect(result[:logs]).to match(/Cached master dir: bootstrapped=asdlfkjadfsklj; current=ff1928f3f8d92/)
212212
expect(result[:logs]).not_to match(%r{Setting --from-catalog=.*/.catalogs/rspec-node.github.net.json})
213213
expect(result[:logs]).to match(/Success build_catalog for test-branch/)
214214
expect(result[:logs]).to match(/Success build_catalog for master/)
215-
expect(result[:logs]).to match(/Cached master directory bootstrapped to 948b3874f5af7f91a5f370e306731fec048fa62e/)
215+
expect(result[:logs]).to match(/Cached master directory bootstrapped to ff1928f3f8d9295c3f26b1de70977ed3eea9329e/)
216216

217217
# Make sure the flag file got removed
218218
expect(File.file?(File.join(@cached_master_dir, '.flag'))).to eq(false)

spec/octocatalog-diff/tests/catalog-util/cached_master_directory_spec.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
@default_options[:basedir] = File.join(@git_checkout_dir, 'git-repo') unless @git_checkout_dir.nil?
3232

3333
# If the fixture changes, this will have to be updated.
34-
@master_sha = '948b3874f5af7f91a5f370e306731fec048fa62e'
34+
@master_sha = 'ff1928f3f8d9295c3f26b1de70977ed3eea9329e'
3535
end
3636

3737
after(:all) do
@@ -309,7 +309,7 @@
309309

310310
it 'should write the current sha to the cached master directory' do
311311
shafile = File.join(@cachedir, '.catalog-diff-master.sha')
312-
expect(File.read(shafile)).to eq('948b3874f5af7f91a5f370e306731fec048fa62e')
312+
expect(File.read(shafile)).to eq('ff1928f3f8d9295c3f26b1de70977ed3eea9329e')
313313
end
314314

315315
it 'should create a .catalogs directory' do
@@ -320,7 +320,7 @@
320320
str = @logger_str.string
321321
expect(str).to match(/Begin bootstrap cached master directory/)
322322
expect(str).to match(/Success bootstrap cached master directory/)
323-
expect(str).to match(/Cached master directory bootstrapped to 948b3874f5af7f91a5f370e306731fec048fa62e/)
323+
expect(str).to match(/Cached master directory bootstrapped to ff1928f3f8d9295c3f26b1de70977ed3eea9329e/)
324324
# There are more log messages too, but these are in other classes/methods
325325
end
326326
end

spec/octocatalog-diff/tests/cli_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134
str = @logger_str.string
135135
expect(str).to match(/Begin bootstrap cached master directory/)
136136
expect(str).to match(/Success bootstrap from_dir .* for master/)
137-
expect(str).to match(/Cached master directory bootstrapped to 948b3874f5af7f91a5f370e306731fec048fa62e/)
137+
expect(str).to match(/Cached master directory bootstrapped to ff1928f3f8d9295c3f26b1de70977ed3eea9329e/)
138138

139139
# This comes from the class and method under test
140140
expect(str).to match(/Cached master catalog for my.rspec.node/)

0 commit comments

Comments
 (0)