Skip to content

Commit 19077ed

Browse files
jcouballjcouball
committed
Ioslate failing tests
Signed-off-by: James Couball <jcouball@yahoo.com>
1 parent 9d57386 commit 19077ed

File tree

5 files changed

+459
-423
lines changed

5 files changed

+459
-423
lines changed

‎.github/workflows/continuous_integration.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
ruby: [2.3, 2.7, 3.0]
17-
operating-system: [ubuntu-latest]
16+
# ruby: [2.3, 2.7, 3.0]
17+
# operating-system: [ubuntu-latest]
1818
include:
19-
- ruby: head
20-
operating-system: ubuntu-latest
21-
- ruby: truffleruby-head
22-
operating-system: ubuntu-latest
23-
- ruby: 2.7
24-
operating-system: windows-latest
19+
# - ruby: head
20+
# operating-system: ubuntu-latest
21+
# - ruby: truffleruby-head
22+
# operating-system: ubuntu-latest
23+
# - ruby: 2.7
24+
# operating-system: windows-latest
2525
- ruby: jruby-head
2626
operating-system: windows-latest
2727

‎tests/all_tests.rb

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1-
Dir.chdir(File.dirname(__FILE__)) do
2-
Dir.glob('**/test_*.rb') do |test_case|
3-
require "#{File.expand_path(File.dirname(__FILE__))}/#{test_case}"
4-
end
5-
end
1+
# Dir.chdir(File.dirname(__FILE__)) do
2+
# Dir.glob('**/test_*.rb') do |test_case|
3+
# require "#{File.expand_path(File.dirname(__FILE__))}/#{test_case}"
4+
# end
5+
# end
66

77
# To run a single test:
88
# require_relative 'units/test_lib_meets_required_version'
9+
# require_relative 'units/test_git_dir'
10+
# require_relative 'units/test_lib'
11+
require_relative 'units/test_merge'

‎tests/units/test_git_dir.rb

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,22 @@
33
require File.dirname(__FILE__) + '/../test_helper'
44

55
class TestGitDir < Test::Unit::TestCase
6-
def test_index_calculated_from_git_dir
7-
Dir.mktmpdir do |work_tree|
8-
Dir.mktmpdir do |git_dir|
9-
git = Git.open(work_tree, repository: git_dir)
6+
# def test_index_calculated_from_git_dir
7+
# Dir.mktmpdir do |work_tree|
8+
# Dir.mktmpdir do |git_dir|
9+
# git = Git.open(work_tree, repository: git_dir)
1010

11-
assert_equal(work_tree, git.dir.path)
12-
assert_equal(git_dir, git.repo.path)
11+
# assert_equal(work_tree, git.dir.path)
12+
# assert_equal(git_dir, git.repo.path)
1313

14-
# Since :index was not given in the options to Git#open, index should
15-
# be defined automatically based on the git_dir.
16-
#
17-
index = File.join(git_dir, 'index')
18-
assert_equal(index, git.index.path)
19-
end
20-
end
21-
end
14+
# # Since :index was not given in the options to Git#open, index should
15+
# # be defined automatically based on the git_dir.
16+
# #
17+
# index = File.join(git_dir, 'index')
18+
# assert_equal(index, git.index.path)
19+
# end
20+
# end
21+
# end
2222

2323
# Test the case where the git-dir is not a subdirectory of work-tree
2424
#
@@ -78,20 +78,20 @@ def test_git_dir_outside_work_tree
7878
# This is a real world case where '.git' in the working tree is a file
7979
# instead of a directory and where the value of GIT_INDEX_FILE is relevant.
8080
#
81-
def test_git_diff_to_a
82-
work_tree = Dir.mktmpdir
83-
begin
84-
Dir.chdir(work_tree) do
85-
`git init`
86-
`git commit --allow-empty -m 'init'`
87-
`git worktree add --quiet child`
88-
Dir.chdir('child') do
89-
result = Git.open('.').diff.to_a
90-
assert_equal([], result)
91-
end
92-
end
93-
ensure
94-
FileUtils.rm_rf(work_tree)
95-
end
96-
end
81+
# def test_git_diff_to_a
82+
# work_tree = Dir.mktmpdir
83+
# begin
84+
# Dir.chdir(work_tree) do
85+
# `git init`
86+
# `git commit --allow-empty -m 'init'`
87+
# `git worktree add --quiet child`
88+
# Dir.chdir('child') do
89+
# result = Git.open('.').diff.to_a
90+
# assert_equal([], result)
91+
# end
92+
# end
93+
# ensure
94+
# FileUtils.rm_rf(work_tree)
95+
# end
96+
# end
9797
end

0 commit comments

Comments
 (0)