@@ -685,17 +685,35 @@ def test_uncommitted_tracked_changes_that_conflict_append(self):
685685
686686class TestEmptyDir (TestEndToEnd ):
687687
688+ def test_empty_dir_status (self ):
689+ untracked_empty_dir = self ._mk_empty_dir ('untracked_empty_dir' )
690+
691+ out = utils .stdout (gl .status ())
692+
693+ self .assertIn (untracked_empty_dir , out , 'Empty dir didn\' t appear in status' )
694+
695+ def test_ignored_empty_dir_status (self ):
696+ ignored_empty_dir = self ._mk_empty_dir ('ignored_empty_dir' )
697+ utils .write_file (os .path .join (self .path , '.gitignore' ), ignored_empty_dir )
698+
699+ out = utils .stdout (gl .status ())
700+
701+ self .assertFalse (ignored_empty_dir in out ,
702+ 'Ignored empty dir was listed in status' )
703+
688704 def test_track_empty_dir (self ):
689- dir_to_track = 'wanted_empty_dir'
690- dir_to_track_path = os .path .join (self .path , dir_to_track )
691- os .mkdir (dir_to_track_path )
705+ dir_to_track = self ._mk_empty_dir ('wanted_empty_dir' )
692706 expected_out = 'Empty directory {0} is now a tracked directory' .format (
693707 os .path .join (dir_to_track , '' ))
694708
695- out = utils .stdout (gl .track (dir_to_track_path ))
709+ out = utils .stdout (gl .track (dir_to_track ))
696710
697711 self .assertIn (expected_out , out , 'Empty dir wasn\' t tracked' )
698712
713+ def _mk_empty_dir (self , name ):
714+ os .mkdir (os .path .join (self .path , name ))
715+ return name
716+
699717
700718class TestPerformance (TestEndToEnd ):
701719
0 commit comments