test_cli: try to fix windows again
authorBrian Warner <warner@allmydata.com>
Thu, 30 Oct 2008 19:32:04 +0000 (12:32 -0700)
committerBrian Warner <warner@allmydata.com>
Thu, 30 Oct 2008 19:32:04 +0000 (12:32 -0700)
src/allmydata/test/test_cli.py

index 204065e0c80bcb5d8dcf868663d1b0e7120fe898..4de6740b74977a05515ee7cfa8dcbeb1b6ef3af6 100644 (file)
@@ -242,8 +242,16 @@ class CLI(unittest.TestCase):
         # now make sure that the 'catalog-shares' commands survives the error
         out, err = self._catalog_shares(nodedir1, nodedir2)
         self.failUnlessEqual(out, "", out)
-        self.failUnless("Error processing " in err, err)
-        self.failUnless(nodedir1 in err, err)
+        self.failUnless("Error processing " in err,
+                        "didn't see 'error processing' in '%s'" % err)
+        #self.failUnless(nodedir1 in err,
+        #                "didn't see '%s' in '%s'" % (nodedir1, err))
+        # windows mangles the path, and os.path.join isn't enough to make
+        # up for it, so just look for individual strings
+        self.failUnless("node1" in err,
+                        "didn't see 'node1' in '%s'" % err)
+        self.failUnless("mqfblse6m5a6dh45isu2cg7oji" in err,
+                        "didn't see 'mqfblse6m5a6dh45isu2cg7oji' in '%s'" % err)
 
 
 class CLITestMixin: