[DRE-commits] [SCM] gem2deb.git branch, master, updated. 0.2.9-10-gcb83a3d

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit 64bf9d12b1275e5754eea112558e59ca697bd7be
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sat Nov 5 23:03:14 2011 -0200

    More tests for Gem2Deb::DhRuby#remove_duplicate_files

diff --git a/lib/gem2deb/dh_ruby.rb b/lib/gem2deb/dh_ruby.rb
index 3a475b0..8e3fcfd 100644
--- a/lib/gem2deb/dh_ruby.rb
+++ b/lib/gem2deb/dh_ruby.rb
@@ -174,11 +174,11 @@ module Gem2Deb
           file_handler.rm(file2)
         elsif File.directory?(file1) and File.directory?(file2)
           remove_duplicate_files(file1, file2)
-          if (Dir.entries(file2) - ['.', '..']).empty?
-            file_handler.rmdir(file2)
-          end
         end
       end
+      if (Dir.entries(dst) - ['.', '..']).empty?
+        file_handler.rmdir(dst)
+      end
     end
 
     def file_handler
diff --git a/test/unit/dh_ruby_test.rb b/test/unit/dh_ruby_test.rb
index 067e883..5ceb8de 100644
--- a/test/unit/dh_ruby_test.rb
+++ b/test/unit/dh_ruby_test.rb
@@ -235,16 +235,30 @@ class DhRubyTest < Gem2DebTestCase
     setup do
       @dh_ruby = Gem2Deb::DhRuby.new
       @dh_ruby.verbose = false
+      @tmpdir = Dir.mktmpdir
     end
-    should 'not crash with duplicates in subdirectories' do
-      Dir.mktmpdir do |dir|
-        Dir.chdir(dir) do
-          FileUtils.mkdir_p('dir1/subdir')
-          FileUtils.touch('dir1/subdir/test.rb')
-          FileUtils.mkdir_p('dir2/subdir')
-          FileUtils.touch('dir2/subdir/test.rb')
-          @dh_ruby.send(:remove_duplicate_files, 'dir1', 'dir2')
+    teardown do
+      FileUtils.rm_rf(@tmpdir)
+    end
+    should 'actually remove duplicates' do
+      Dir.chdir(@tmpdir) do
+        FileUtils.mkdir('dir1')
+        FileUtils.mkdir('dir2')
+        ['dir1','dir2'].each do |d|
+          File.open(File.join(d, 'test.rb'), 'w') { |f| f.puts "# Nice File"}
         end
+        @dh_ruby.send(:remove_duplicate_files, 'dir1', 'dir2')
+        assert !File.exists?('dir2')
+      end
+    end
+    should 'not crash with duplicates in subdirectories' do
+      Dir.chdir(@tmpdir) do
+        FileUtils.mkdir_p('dir1/subdir')
+        FileUtils.touch('dir1/subdir/test.rb')
+        FileUtils.mkdir_p('dir2/subdir')
+        FileUtils.touch('dir2/subdir/test.rb')
+        @dh_ruby.send(:remove_duplicate_files, 'dir1', 'dir2')
+        assert !File.exists?('dir2')
       end
     end
   end

-- 
gem2deb.git