Bug 1304593 - Fix broken test_entry_point.py in mach draft
authorAndrew Halberstadt <ahalberstadt@mozilla.com>
Tue, 27 Sep 2016 17:11:00 -0400
changeset 419147 e1a053a45e00497519a01e4464e3d9ed147624ec
parent 419033 9baec74b3db1bf005c66ae2f50bafbdb02c3be38
child 419148 ed36151c20aa00de7b89b9a7be87dae94a208f2b
push id30857
push userahalberstadt@mozilla.com
push dateThu, 29 Sep 2016 18:45:26 +0000
bugs1304593
milestone52.0a1
Bug 1304593 - Fix broken test_entry_point.py in mach MozReview-Commit-ID: FtMpt8Nmq3g
python/mach/mach/test/test_entry_point.py
--- a/python/mach/mach/test/test_entry_point.py
+++ b/python/mach/mach/test/test_entry_point.py
@@ -11,50 +11,51 @@ from mach.base import MachError
 from mach.test.common import TestBase
 from mock import patch
 
 from mozunit import main
 
 
 here = os.path.abspath(os.path.dirname(__file__))
 
+
 class Entry():
     """Stub replacement for pkg_resources.EntryPoint"""
     def __init__(self, providers):
         self.providers = providers
 
     def load(self):
         def _providers():
             return self.providers
         return _providers
 
+
 class TestEntryPoints(TestBase):
     """Test integrating with setuptools entry points"""
     provider_dir = os.path.join(here, 'providers')
 
     def _run_mach(self):
         return TestBase._run_mach(self, ['help'], entry_point='mach.providers')
 
     @patch('pkg_resources.iter_entry_points')
     def test_load_entry_point_from_directory(self, mock):
         # Ensure parent module is present otherwise we'll (likely) get
         # an error due to unknown parent.
         if b'mach.commands' not in sys.modules:
             mod = imp.new_module(b'mach.commands')
             sys.modules[b'mach.commands'] = mod
 
-        mock.return_value = [Entry(['providers'])]
+        mock.return_value = [Entry([self.provider_dir])]
         # Mach error raised due to conditions_invalid.py
         with self.assertRaises(MachError):
             self._run_mach()
 
     @patch('pkg_resources.iter_entry_points')
     def test_load_entry_point_from_file(self, mock):
-        mock.return_value = [Entry([os.path.join('providers', 'basic.py')])]
+        mock.return_value = [Entry([os.path.join(self.provider_dir, 'basic.py')])]
 
         result, stdout, stderr = self._run_mach()
         self.assertIsNone(result)
         self.assertIn('cmd_foo', stdout)
 
 
-# Not enabled in automation because tests are failing.
-#if __name__ == '__main__':
-#    main()
+if __name__ == '__main__':
+    main()