← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/__init__.py

Merge from integration

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/__init__.py
589
589
        """Return a list of the klass, server_factory pairs to test."""
590
590
        result = []
591
591
        for module in _get_transport_modules():
592
 
            result.extend(self.get_transport_test_permutations(reduce(getattr, 
593
 
                (module).split('.')[1:],
594
 
                 __import__(module))))
 
592
            try:
 
593
                result.extend(self.get_transport_test_permutations(reduce(getattr, 
 
594
                    (module).split('.')[1:],
 
595
                     __import__(module))))
 
596
            except errors.DependencyNotPresent, e:
 
597
                # Continue even if a dependency prevents us 
 
598
                # from running this test
 
599
                pass
595
600
        return result
596
601
        
597
602