diff options
author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2019-06-01 12:45:11 +0300 |
---|---|---|
committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2019-06-01 13:50:41 +0300 |
commit | 56660de3c6df7a4ff8667ef4047d30d0de169935 (patch) | |
tree | dd1e526075687b4b24e089cee50eabc21a6143cc /test/rubygems/test_gem_indexer.rb | |
parent | 560cd5b1f04f30542a294b3d77527d3b12f7cc15 (diff) |
Merge rubygems master from upstream.
I picked the commit from 3c469e0da538428a0ddd94f99aa73c32da22e8ba
Diffstat (limited to 'test/rubygems/test_gem_indexer.rb')
-rw-r--r-- | test/rubygems/test_gem_indexer.rb | 70 |
1 files changed, 31 insertions, 39 deletions
diff --git a/test/rubygems/test_gem_indexer.rb b/test/rubygems/test_gem_indexer.rb index ce08702c41..43a04c3bb3 100644 --- a/test/rubygems/test_gem_indexer.rb +++ b/test/rubygems/test_gem_indexer.rb @@ -11,7 +11,6 @@ class TestGemIndexer < Gem::TestCase def setup super - util_clear_gems util_make_gems @d2_0 = util_spec 'd', '2.0' do |s| @@ -28,30 +27,23 @@ class TestGemIndexer < Gem::TestCase @default = new_default_spec 'default', 2 install_default_gems @default - @tempdir = File.join(@tempdir, 'indexer') + @indexerdir = File.join(@tempdir, 'indexer') - gems = File.join(@tempdir, 'gems') + gems = File.join(@indexerdir, 'gems') FileUtils.mkdir_p gems FileUtils.mv Dir[File.join(@gemhome, "cache", '*.gem')], gems - @indexer = Gem::Indexer.new(@tempdir) - end - - def teardown - super - - util_clear_gems - util_clear_default_gems + @indexer = Gem::Indexer.new(@indexerdir) end def test_initialize - assert_equal @tempdir, @indexer.dest_directory + assert_equal @indexerdir, @indexer.dest_directory assert_match %r{#{Dir.mktmpdir('gem_generate_index').match(/.*-/)}}, @indexer.directory - indexer = Gem::Indexer.new @tempdir + indexer = Gem::Indexer.new @indexerdir assert indexer.build_modern - indexer = Gem::Indexer.new @tempdir, :build_modern => true + indexer = Gem::Indexer.new @indexerdir, :build_modern => true assert indexer.build_modern end @@ -100,7 +92,7 @@ class TestGemIndexer < Gem::TestCase @indexer.generate_index end - quickdir = File.join @tempdir, 'quick' + quickdir = File.join @indexerdir, 'quick' marshal_quickdir = File.join quickdir, "Marshal.#{@marshal_version}" assert_directory_exists quickdir @@ -111,11 +103,11 @@ class TestGemIndexer < Gem::TestCase refute_indexed marshal_quickdir, File.basename(@c1_2.spec_file) - assert_indexed @tempdir, "specs.#{@marshal_version}" - assert_indexed @tempdir, "specs.#{@marshal_version}.gz" + assert_indexed @indexerdir, "specs.#{@marshal_version}" + assert_indexed @indexerdir, "specs.#{@marshal_version}.gz" - assert_indexed @tempdir, "latest_specs.#{@marshal_version}" - assert_indexed @tempdir, "latest_specs.#{@marshal_version}.gz" + assert_indexed @indexerdir, "latest_specs.#{@marshal_version}" + assert_indexed @indexerdir, "latest_specs.#{@marshal_version}.gz" end def test_generate_index_modern @@ -125,12 +117,12 @@ class TestGemIndexer < Gem::TestCase @indexer.generate_index end - refute_indexed @tempdir, 'yaml' - refute_indexed @tempdir, 'yaml.Z' - refute_indexed @tempdir, "Marshal.#{@marshal_version}" - refute_indexed @tempdir, "Marshal.#{@marshal_version}.Z" + refute_indexed @indexerdir, 'yaml' + refute_indexed @indexerdir, 'yaml.Z' + refute_indexed @indexerdir, "Marshal.#{@marshal_version}" + refute_indexed @indexerdir, "Marshal.#{@marshal_version}.Z" - quickdir = File.join @tempdir, 'quick' + quickdir = File.join @indexerdir, 'quick' marshal_quickdir = File.join quickdir, "Marshal.#{@marshal_version}" assert_directory_exists quickdir, 'quickdir should be directory' @@ -156,11 +148,11 @@ class TestGemIndexer < Gem::TestCase refute_indexed quickdir, "#{File.basename(@c1_2.spec_file)}" refute_indexed marshal_quickdir, "#{File.basename(@c1_2.spec_file)}" - assert_indexed @tempdir, "specs.#{@marshal_version}" - assert_indexed @tempdir, "specs.#{@marshal_version}.gz" + assert_indexed @indexerdir, "specs.#{@marshal_version}" + assert_indexed @indexerdir, "specs.#{@marshal_version}.gz" - assert_indexed @tempdir, "latest_specs.#{@marshal_version}" - assert_indexed @tempdir, "latest_specs.#{@marshal_version}.gz" + assert_indexed @indexerdir, "latest_specs.#{@marshal_version}" + assert_indexed @indexerdir, "latest_specs.#{@marshal_version}.gz" end def test_generate_index_modern_back_to_back @@ -170,13 +162,13 @@ class TestGemIndexer < Gem::TestCase @indexer.generate_index end - @indexer = Gem::Indexer.new @tempdir + @indexer = Gem::Indexer.new @indexerdir @indexer.build_modern = true use_ui @ui do @indexer.generate_index end - quickdir = File.join @tempdir, 'quick' + quickdir = File.join @indexerdir, 'quick' marshal_quickdir = File.join quickdir, "Marshal.#{@marshal_version}" assert_directory_exists quickdir @@ -185,11 +177,11 @@ class TestGemIndexer < Gem::TestCase assert_indexed marshal_quickdir, "#{File.basename(@a1.spec_file)}.rz" assert_indexed marshal_quickdir, "#{File.basename(@a2.spec_file)}.rz" - assert_indexed @tempdir, "specs.#{@marshal_version}" - assert_indexed @tempdir, "specs.#{@marshal_version}.gz" + assert_indexed @indexerdir, "specs.#{@marshal_version}" + assert_indexed @indexerdir, "specs.#{@marshal_version}.gz" - assert_indexed @tempdir, "latest_specs.#{@marshal_version}" - assert_indexed @tempdir, "latest_specs.#{@marshal_version}.gz" + assert_indexed @indexerdir, "latest_specs.#{@marshal_version}" + assert_indexed @indexerdir, "latest_specs.#{@marshal_version}.gz" end def test_generate_index_ui @@ -215,7 +207,7 @@ class TestGemIndexer < Gem::TestCase @indexer.generate_index end - specs_path = File.join @tempdir, "specs.#{@marshal_version}" + specs_path = File.join @indexerdir, "specs.#{@marshal_version}" specs_dump = Gem.read_binary specs_path specs = Marshal.load specs_dump @@ -252,7 +244,7 @@ class TestGemIndexer < Gem::TestCase @indexer.generate_index end - latest_specs_path = File.join @tempdir, "latest_specs.#{@marshal_version}" + latest_specs_path = File.join @indexerdir, "latest_specs.#{@marshal_version}" latest_specs_dump = Gem.read_binary latest_specs_path latest_specs = Marshal.load latest_specs_dump @@ -282,7 +274,7 @@ class TestGemIndexer < Gem::TestCase @indexer.generate_index end - prerelease_specs_path = File.join @tempdir, "prerelease_specs.#{@marshal_version}" + prerelease_specs_path = File.join @indexerdir, "prerelease_specs.#{@marshal_version}" prerelease_specs_dump = Gem.read_binary prerelease_specs_path prerelease_specs = Marshal.load prerelease_specs_dump @@ -311,7 +303,7 @@ class TestGemIndexer < Gem::TestCase @indexer.generate_index end - quickdir = File.join @tempdir, 'quick' + quickdir = File.join @indexerdir, 'quick' marshal_quickdir = File.join quickdir, "Marshal.#{@marshal_version}" assert_directory_exists quickdir @@ -325,7 +317,7 @@ class TestGemIndexer < Gem::TestCase util_build_gem @d2_1_a @d2_1_a_tuple = [@d2_1_a.name, @d2_1_a.version, @d2_1_a.original_platform] - gems = File.join @tempdir, 'gems' + gems = File.join @indexerdir, 'gems' FileUtils.mv @d2_1.cache_file, gems FileUtils.mv @d2_1_a.cache_file, gems |