summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2011-07-29 13:33:10 +0100
committerLars Wirzenius <liw@liw.fi>2011-07-29 13:33:10 +0100
commit54762e723e59adb697afc4e37e9ac4e9884c83ba (patch)
tree6e883c01c5293397e4191a5e2ac2ba58c42e5303
parentb9a9db2fc8ed94ab3f9386259a9e2e31681e9fcc (diff)
downloadobnam-54762e723e59adb697afc4e37e9ac4e9884c83ba.tar.gz
Fix blackboxtest to not worry about st_nlink when using sftp for live data.
It currently never works for paramiko, so we should never fail because of it.
-rwxr-xr-xblackboxtest9
1 files changed, 7 insertions, 2 deletions
diff --git a/blackboxtest b/blackboxtest
index 9bc0f27e..264b5cd6 100755
--- a/blackboxtest
+++ b/blackboxtest
@@ -284,8 +284,13 @@ class ObnamTestCase(unittest.TestCase):
self.assert_equal_stat_fields(name, stat1, stat2, 'st_blocks')
self.assert_equal_stat_fields(name, stat1, stat2, 'st_gid')
self.assert_equal_stat_fields(name, stat1, stat2, 'st_mode')
- self.assert_equal_stat_fields(name, Fake(stat1), Fake(stat2), 'st_mtime')
- self.assert_equal_stat_fields(name, stat1, stat2, 'st_nlink')
+ self.assert_equal_stat_fields(name, Fake(stat1), Fake(stat2),
+ 'st_mtime')
+ if self.data == self.data_dir:
+ # We can only check this when accessing the live data via the
+ # local filesystem. SFTP (or paramiko) does not return st_nlink,
+ # so we fake it, so this test always fails for them.
+ self.assert_equal_stat_fields(name, stat1, stat2, 'st_nlink')
self.assert_equal_stat_fields(name, stat1, stat2, 'st_size')
self.assert_equal_stat_fields(name, stat1, stat2, 'st_uid')