add tests for git patching

ooyala · Jan 13, 2011 · 6ce0e43 · 6ce0e43
1 parent a3c5139
commit 6ce0e43
Show file tree

Hide file tree

Showing 25 changed files with 74 additions and 1 deletion.
diff --git a/test/patch/COMMIT_EDITMSG b/test/patch/COMMIT_EDITMSG
@@ -0,0 +1 @@
+good patch
diff --git a/test/patch/HEAD b/test/patch/HEAD
@@ -0,0 +1 @@
+ref: refs/heads/master
diff --git a/test/patch/config b/test/patch/config
@@ -0,0 +1,6 @@
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = false
+	logallrefupdates = true
+	ignorecase = true
diff --git a/test/patch/description b/test/patch/description
@@ -0,0 +1 @@
+Unnamed repository; edit this file 'description' to name the repository.
diff --git a/test/patch/index b/test/patch/index
diff --git a/test/patch/info/exclude b/test/patch/info/exclude
@@ -0,0 +1,6 @@
+# git ls-files --others --exclude-from=.git/info/exclude
+# Lines that start with '#' are comments.
+# For a project mostly in C, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~
diff --git a/test/patch/logs/HEAD b/test/patch/logs/HEAD
@@ -0,0 +1,8 @@
+0000000000000000000000000000000000000000 5da862ffd84e42b687b65605788f4158f4610400 rick <technoweenie@gmail.com> 1294902968 -0800	commit (initial): initial
+5da862ffd84e42b687b65605788f4158f4610400 5da862ffd84e42b687b65605788f4158f4610400 rick <technoweenie@gmail.com> 1294902973 -0800	checkout: moving from master to bad
+5da862ffd84e42b687b65605788f4158f4610400 f252f9a68245f465d27b31fcdbf63ab55de58b06 rick <technoweenie@gmail.com> 1294902998 -0800	commit: bad patch
+f252f9a68245f465d27b31fcdbf63ab55de58b06 5da862ffd84e42b687b65605788f4158f4610400 rick <technoweenie@gmail.com> 1294902999 -0800	checkout: moving from bad to master
+5da862ffd84e42b687b65605788f4158f4610400 cf75ecfce82fb2a8723f86b140980994f0065ecd rick <technoweenie@gmail.com> 1294903011 -0800	commit: update
+cf75ecfce82fb2a8723f86b140980994f0065ecd cf75ecfce82fb2a8723f86b140980994f0065ecd rick <technoweenie@gmail.com> 1294903013 -0800	checkout: moving from master to good
+cf75ecfce82fb2a8723f86b140980994f0065ecd f3c031e78b368d1b9b03c3eb1b90d8a122277e67 rick <technoweenie@gmail.com> 1294903038 -0800	commit: good patch
+f3c031e78b368d1b9b03c3eb1b90d8a122277e67 cf75ecfce82fb2a8723f86b140980994f0065ecd rick <technoweenie@gmail.com> 1294903041 -0800	checkout: moving from good to master
diff --git a/test/patch/logs/refs/heads/bad b/test/patch/logs/refs/heads/bad
@@ -0,0 +1,2 @@
+0000000000000000000000000000000000000000 5da862ffd84e42b687b65605788f4158f4610400 rick <technoweenie@gmail.com> 1294902973 -0800	branch: Created from HEAD
+5da862ffd84e42b687b65605788f4158f4610400 f252f9a68245f465d27b31fcdbf63ab55de58b06 rick <technoweenie@gmail.com> 1294902998 -0800	commit: bad patch
diff --git a/test/patch/logs/refs/heads/good b/test/patch/logs/refs/heads/good
@@ -0,0 +1,2 @@
+0000000000000000000000000000000000000000 cf75ecfce82fb2a8723f86b140980994f0065ecd rick <technoweenie@gmail.com> 1294903013 -0800	branch: Created from HEAD
+cf75ecfce82fb2a8723f86b140980994f0065ecd f3c031e78b368d1b9b03c3eb1b90d8a122277e67 rick <technoweenie@gmail.com> 1294903038 -0800	commit: good patch
diff --git a/test/patch/logs/refs/heads/master b/test/patch/logs/refs/heads/master
@@ -0,0 +1,2 @@
+0000000000000000000000000000000000000000 5da862ffd84e42b687b65605788f4158f4610400 rick <technoweenie@gmail.com> 1294902968 -0800	commit (initial): initial
+5da862ffd84e42b687b65605788f4158f4610400 cf75ecfce82fb2a8723f86b140980994f0065ecd rick <technoweenie@gmail.com> 1294903011 -0800	commit: update
diff --git a/test/patch/objects/0d/59bef5ff65a0f09ae0259a4f20625ff9d9d64b b/test/patch/objects/0d/59bef5ff65a0f09ae0259a4f20625ff9d9d64b
diff --git a/test/patch/objects/5d/a862ffd84e42b687b65605788f4158f4610400 b/test/patch/objects/5d/a862ffd84e42b687b65605788f4158f4610400
@@ -0,0 +1,2 @@
+x��]
+B!@�]�l���'�K�ө;tU����[����)�50!�d�}����9��->�!�5<,z�)TJ�1���}L�\ް	���/Qg��Z��RF����^*�YG�ժk'�7T�Y8�̓5�
diff --git a/test/patch/objects/6f/3cad7a2f103336238fa22cc6d947525b16dfa8 b/test/patch/objects/6f/3cad7a2f103336238fa22cc6d947525b16dfa8
diff --git a/test/patch/objects/72/56d4ce5aa848032fc1e23d6b3254296de9e529 b/test/patch/objects/72/56d4ce5aa848032fc1e23d6b3254296de9e529
diff --git a/test/patch/objects/89/3adcd31e963b01dfbbcfe3ec58a008f0d81201 b/test/patch/objects/89/3adcd31e963b01dfbbcfe3ec58a008f0d81201
diff --git a/test/patch/objects/c3/1db71f041e94f88e44b72f2634a810d4ec61c2 b/test/patch/objects/c3/1db71f041e94f88e44b72f2634a810d4ec61c2
diff --git a/test/patch/objects/cf/75ecfce82fb2a8723f86b140980994f0065ecd b/test/patch/objects/cf/75ecfce82fb2a8723f86b140980994f0065ecd
diff --git a/test/patch/objects/e7/9c5e8f964493290a409888d5413a737e8e5dd5 b/test/patch/objects/e7/9c5e8f964493290a409888d5413a737e8e5dd5
diff --git a/test/patch/objects/f2/52f9a68245f465d27b31fcdbf63ab55de58b06 b/test/patch/objects/f2/52f9a68245f465d27b31fcdbf63ab55de58b06
diff --git a/test/patch/objects/f3/c031e78b368d1b9b03c3eb1b90d8a122277e67 b/test/patch/objects/f3/c031e78b368d1b9b03c3eb1b90d8a122277e67
diff --git a/test/patch/refs/heads/bad b/test/patch/refs/heads/bad
@@ -0,0 +1 @@
+f252f9a68245f465d27b31fcdbf63ab55de58b06
diff --git a/test/patch/refs/heads/good b/test/patch/refs/heads/good
@@ -0,0 +1 @@
+f3c031e78b368d1b9b03c3eb1b90d8a122277e67
diff --git a/test/patch/refs/heads/master b/test/patch/refs/heads/master
@@ -0,0 +1 @@
+cf75ecfce82fb2a8723f86b140980994f0065ecd
diff --git a/test/test_git.rb b/test/test_git.rb
@@ -20,7 +20,7 @@ def test_logs_stderr
     @git.bad
   end
 
-  def testl_logs_stderr_when_skipping_timeout
+  def test_logs_stderr_when_skipping_timeout
     Grit.debug = true
     Grit.stubs(:log)
     Grit.expects(:log).with(includes("git: 'bad' is not a git command"))

diff --git a/test/test_git_patching.rb b/test/test_git_patching.rb
@@ -0,0 +1,39 @@
+require File.dirname(__FILE__) + '/helper'
+
+class TestGitPatching < Test::Unit::TestCase
+  def setup
+    @testdir  = File.dirname(__FILE__)
+    @patchdir = File.join(@testdir, 'patch')
+    @clonedir = File.join(@testdir, 'patch_clone.git')
+    @git = Git.new(@patchdir)
+  end
+
+  def teardown
+    Grit.debug = false
+    FileUtils.rm_rf(@clonedir)
+  end
+
+  def test_gets_a_valid_patch
+    assert_match /\-patchme/, @git.get_patch("good")
+    assert_match /\-initial/, @git.get_patch("bad")
+  end
+
+  def test_checks_patch_applies
+    assert_equal 0, @git.check_applies("master", "good")
+    assert_equal 1, @git.check_applies("master", "bad")
+  end
+
+  def test_applies_patch
+    repo  = Grit::Repo.new(@patchdir, :is_bare => true)
+    clone = repo.fork_bare(@clonedir)
+    assert_equal 'patchme', (clone.tree / 'patchme').data.strip
+
+    badpatch = clone.git.get_patch('bad')
+    assert !clone.git.apply_patch('master', badpatch)
+    assert_equal 'patchme', (clone.tree / 'patchme').data.strip
+
+    goodpatch = clone.git.get_patch('good')
+    sha = clone.git.apply_patch('master', goodpatch)
+    assert_equal 'patched', (clone.tree(sha) / 'patchme').data.strip
+  end
+end