X-Git-Url: https://git.rkrishnan.org/?p=tahoe-lafs%2Ftahoe-lafs.git;a=blobdiff_plain;f=src%2Fallmydata%2Ftest%2Ftest_web.py;fp=src%2Fallmydata%2Ftest%2Ftest_web.py;h=2a968f9aed4f5087b6dd74849e9a0e69568364e2;hp=18514a3a57b012bbebf4cbe3d35b9a9e9d3571cf;hb=c6449b687a6b2fc95ec9f6afd938a20f60a731ab;hpb=7a7faec76b97dd1c35aa69fb7178430eb619e404
diff --git a/src/allmydata/test/test_web.py b/src/allmydata/test/test_web.py
index 18514a3a..2a968f9a 100644
--- a/src/allmydata/test/test_web.py
+++ b/src/allmydata/test/test_web.py
@@ -634,10 +634,25 @@ class Web(WebMixin, WebErrorMixin, testutil.StallMixin, testutil.ReallyEqualMixi
self.failUnlessIn(u'
fake_nickname \u263A | ', res_u)
self.failUnlessIn(u'other_nickname \u263B
', res_u)
self.failUnlessIn(u'Connected to 1\n of 2 known storage servers', res_u)
- self.failUnless(re.search(u'\n 1d\u00A00h\u00A00m\u00A050s', res_u), repr(res_u))
- self.failUnless(re.search(u'\n 1d\u00A00h\u00A00m\u00A035s', res_u), repr(res_u))
- self.failUnless(re.search(u'1d\u00A00h\u00A00m\u00A030s | ', res_u), repr(res_u))
- self.failUnless(re.search(u'1d\u00A00h\u00A00m\u00A025s | ', res_u), repr(res_u))
+ def timestamp(t):
+ return (u'"%s"' % (t,)) if self.have_working_tzset() else u'"[^"]*"'
+ self.failUnless(re.search(
+ u''
+ u'
\n 1d\u00A00h\u00A00m\u00A050s'
+ % timestamp(u'1970-01-01 13:00:10'), res_u), repr(res_u))
+ self.failUnless(re.search(
+ u''
+ u'
\n 1d\u00A00h\u00A00m\u00A035s'
+ % timestamp(u'1970-01-01 13:00:25'), res_u), repr(res_u))
+ self.failUnless(re.search(
+ u''
+ u'1d\u00A00h\u00A00m\u00A030s | '
+ % timestamp(u'1970-01-01 13:00:30'), res_u), repr(res_u))
+ self.failUnless(re.search(
+ u''
+ u'1d\u00A00h\u00A00m\u00A025s | '
+ % timestamp(u'1970-01-01 13:00:35'), res_u), repr(res_u))
+
self.failUnlessIn(u'\u00A9 Tahoe-LAFS Software Foundation', res_u)
self.failUnlessIn('Available | ', res)
self.failUnlessIn('123.5kB', res)