be tolerant of tarfile behavior changes in 2.7

buildbot · Aug 25, 2010 · 4507199 · 4507199
1 parent 87fbf3d
commit 4507199
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/slave/buildslave/test/unit/test_commands_transfer.py b/slave/buildslave/test/unit/test_commands_transfer.py
@@ -241,7 +241,8 @@ def check_tarfile(_):
             f = StringIO.StringIO(self.fakemaster.data)
             a = tarfile.open(fileobj=f, name='check.tar')
             exp_names = [ '.', 'aa', 'bb' ]
-            got_names = sorted([ n.rstrip('/') for n in a.getnames() ])
+            got_names = [ n.rstrip('/') for n in a.getnames() ]
+            got_names = sorted([ n or '.' for n in a.getnames() ]) # py27 uses '' instead of '.'
             self.assertEqual(got_names, exp_names, "expected archive contents")
             a.close()
             f.close()