Merge branch 'master' of git://github.com/shoelzer/buildbot

buildbot · Dec 19, 2013 · 974c04e · 974c04e
2 parents d3a59a0 + 67e1da2
commit 974c04e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/master/buildbot/test/unit/test_changes_hgpoller.py b/master/buildbot/test/unit/test_changes_hgpoller.py
@@ -97,7 +97,7 @@ def test_poll_initial(self):
             .path('/some/dir').stdout(os.linesep.join([
                 '1273258100.0 -7200',
                 'Bob Test <bobtest@example.org>',
-                'file1' + os.pathsep + 'dir/file2' + os.pathsep,
+                'file1 with spaces' + os.pathsep + os.path.join('dir with spaces', 'file2') + os.pathsep,
                 'This is rev 73591',
                 ''])),
         )
@@ -115,7 +115,7 @@ def check_changes(_):
                              'Bob Test <bobtest@example.org>')
             self.assertEqual(change['when_timestamp'],
                              epoch2datetime(1273258100)),
-            self.assertEqual(change['files'], ['file1', 'dir/file2'])
+            self.assertEqual(change['files'], ['file1 with spaces', os.path.join('dir with spaces', 'file2')])
             self.assertEqual(change['src'], 'hg')
             self.assertEqual(change['branch'], 'default')
             self.assertEqual(change['comments'], 'This is rev 73591')