Bug 1304593 - Fix broken test_entry_point.py in mach. r=gps, a=NPOTB
authorAndrew Halberstadt <ahalberstadt@mozilla.com>
Tue, 27 Sep 2016 17:11:00 -0400
changeset 355932 f4ca19daa701a745fbeb9b7a48d69b326fd501c4
parent 355931 146b2adddd476d99c02d989fdcad702ef801ad1e
child 355933 70218f843e80d3d278334fb0f518295c40e03ed5
push id6570
push userraliiev@mozilla.com
push dateMon, 14 Nov 2016 12:26:13 +0000
treeherdermozilla-beta@f455459b2ae5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps, NPOTB
bugs1304593
milestone51.0a2
Bug 1304593 - Fix broken test_entry_point.py in mach. r=gps, a=NPOTB Fix and enable python/mach/mach/test/test_entry_poiny.py. 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()