← Back to branch summary

~facundo/ubuntuone-client/fix-svfilenew-conflict

« back to all changes in this revision

Viewing changes to tests/syncdaemon/test_localrescan.py

  • Committer: Facundo Batista
  • Date: 2011-04-04 12:31:43 UTC
  • mfrom: (922.1.9 ubuntuone-client)
  • Revision ID: facundo@taniquetil.com.ar-20110404123143-mobua5abcpinz0o2
Trunk merged in

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/syncdaemon/test_localrescan.py
575
575
        def check(_):
576
576
            """check"""
577
577
            self.assertEqual(self.eq.pushed, [])
578
 
            self.handler.debug = True
579
578
            self.assertTrue(self.handler.check(TRACE,
580
579
                            "comp yield", "was here, let's check stat"))
581
580
 
2447
2446
        self.fsm.create(self.udf.path, udf_id, is_dir=True)
2448
2447
        self.fsm.set_node_id(self.udf.path, node_id)
2449
2448
 
 
2449
        # logging
 
2450
        self.handler = MementoHandler()
 
2451
        self._logger = logging.getLogger('ubuntuone.SyncDaemon')
 
2452
        self._logger.addHandler(self.handler)
 
2453
 
2450
2454
    def tearDown(self):
2451
2455
        """Cleanup."""
2452
2456
        self.eq.add_watch = self.original_add
2460
2464
        else:
2461
2465
            os.environ[self.env_var] = self.old_value
2462
2466
 
 
2467
        self._logger.removeHandler(self.handler)
 
2468
 
2463
2469
        BaseTestCase.tearDown(self)
2464
2470
 
2465
2471
    def test_ancestors_have_watch(self):
2480
2486
                      (expected, actual, difference)
2481
2487
                self._deferred.errback(msg)
2482
2488
 
 
2489
        def check_log(_):
 
2490
            """Check log."""
 
2491
            self.assertTrue(self.handler.check_debug("Adding watch to UDF's",
 
2492
                                                     self.ancestors[0]))
 
2493
 
2483
2494
        d = self.lr.start()
2484
2495
        d.addCallback(ancestors_have_watch)
 
2496
        d.addCallback(check_log)
2485
2497
        return self._deferred
2486
2498
 
2487
2499
    def test_watch_is_not_added_if_present(self):
2495
2507
            for path in self.udf.ancestors:
2496
2508
                self.assertEquals(1, self.watches.count(path))
2497
2509
 
 
2510
        def check_log(_):
 
2511
            """Check log."""
 
2512
            self.assertFalse(self.handler.check_debug("Adding watch to UDF's"))
 
2513
 
2498
2514
        d = self.lr.start()
2499
2515
        d.addCallback(no_watch_added)
2500
2516
        d.addCallback(lambda _:
2501
2517
            self._deferred.callback(None))
 
2518
        d.addCallback(check_log)
2502
2519
        return self._deferred
2503
2520
 
2504
2521