1 --- RBTools-5.0/rbtools/clients/tests/test_git.py.orig
2 +++ RBTools-5.0/rbtools/clients/tests/test_git.py
10 class BaseGitClientTests(SCMClientTestCase):
11 """Base class for unit tests for GitClient.
13 self.assertEqual(repository_info.local_path, self.checkout_dir)
14 self.assertEqual(client._type, client.TYPE_GIT_P4)
16 + @pytest.mark.skip(reason="always fails: https://hellosplat.com/s/beanbag/tickets/4996/")
18 """Testing GitClient.diff with git-p4"""
19 client = self.build_client(needs_diff=True)
24 + @pytest.mark.skip(reason="always fails: https://hellosplat.com/s/beanbag/tickets/4996/")
25 def test_diff_with_spaces_in_filename(self):
26 """Testing GitClient.diff with git-p4 with spaces in filename"""
27 client = self.build_client(needs_diff=True)
32 + @pytest.mark.skip(reason="always fails: https://hellosplat.com/s/beanbag/tickets/4996/")
33 def test_diff_with_rename(self):
34 """Testing GitClient.diff with renamed file"""
35 client = self.build_client(needs_diff=True)
40 + @pytest.mark.skip(reason="always fails: https://hellosplat.com/s/beanbag/tickets/4996/")
41 def test_diff_with_rename_and_changes(self):
42 """Testing GitClient.diff with renamed file and changes"""
43 client = self.build_client(needs_diff=True)
48 + @pytest.mark.skip(reason="always fails: https://hellosplat.com/s/beanbag/tickets/4996/")
49 def test_diff_with_deletes(self):
50 """Testing GitClient.diff with deleted files"""
51 client = self.build_client(needs_diff=True)
56 + @pytest.mark.skip(reason="always fails: https://hellosplat.com/s/beanbag/tickets/4996/")
57 def test_diff_with_multiple_commits(self):
58 """Testing GitClient.diff with git-p4 and multiple commits"""
59 client = self.build_client(needs_diff=True)
64 + @pytest.mark.skip(reason="always fails: https://hellosplat.com/s/beanbag/tickets/4996/")
65 def test_diff_with_exclude_patterns(self):
66 """Testing GitClient.diff with git-p4 and file exclusion"""
67 client = self.build_client(needs_diff=True)
72 + @pytest.mark.skip(reason="always fails: https://hellosplat.com/s/beanbag/tickets/4996/")
73 def test_diff_exclude_in_subdir(self):
74 """Testing GitClient simple diff with file exclusion in a subdir"""
75 client = self.build_client(needs_diff=True)
80 + @pytest.mark.skip(reason="always fails: https://hellosplat.com/s/beanbag/tickets/4996/")
81 def test_diff_with_exclude_patterns_root_pattern_in_subdir(self):
82 """Testing GitClient diff with file exclusion in the repo root"""
83 client = self.build_client(needs_diff=True)