|
@@ -39,7 +39,8 @@ class NinjaReclientTest(trial_dir.TestCase):
|
|
os.chdir(self.previous_dir)
|
|
os.chdir(self.previous_dir)
|
|
super(NinjaReclientTest, self).tearDown()
|
|
super(NinjaReclientTest, self).tearDown()
|
|
|
|
|
|
- @unittest.mock.patch.dict(os.environ, {})
|
|
|
|
|
|
+ @unittest.mock.patch.dict(os.environ,
|
|
|
|
+ {'AUTONINJA_BUILD_ID': "SOME_RANDOM_ID"})
|
|
@unittest.mock.patch('subprocess.call', return_value=0)
|
|
@unittest.mock.patch('subprocess.call', return_value=0)
|
|
@unittest.mock.patch('ninja.main', return_value=0)
|
|
@unittest.mock.patch('ninja.main', return_value=0)
|
|
@unittest.mock.patch('reclient_metrics.check_status', return_value=True)
|
|
@unittest.mock.patch('reclient_metrics.check_status', return_value=True)
|
|
@@ -83,6 +84,7 @@ class NinjaReclientTest(trial_dir.TestCase):
|
|
hashlib.md5(
|
|
hashlib.md5(
|
|
os.path.join(self.root_dir, "out", "a",
|
|
os.path.join(self.root_dir, "out", "a",
|
|
".reproxy_tmp").encode()).hexdigest()))
|
|
".reproxy_tmp").encode()).hexdigest()))
|
|
|
|
+ self.assertIn("/SOME_RANDOM_ID", os.environ["RBE_invocation_id"])
|
|
if sys.platform.startswith('win'):
|
|
if sys.platform.startswith('win'):
|
|
self.assertEqual(
|
|
self.assertEqual(
|
|
os.environ.get('RBE_server_address'),
|
|
os.environ.get('RBE_server_address'),
|
|
@@ -126,7 +128,8 @@ class NinjaReclientTest(trial_dir.TestCase):
|
|
]),
|
|
]),
|
|
])
|
|
])
|
|
|
|
|
|
- @unittest.mock.patch.dict(os.environ, {})
|
|
|
|
|
|
+ @unittest.mock.patch.dict(os.environ,
|
|
|
|
+ {'AUTONINJA_BUILD_ID': "SOME_RANDOM_ID"})
|
|
@unittest.mock.patch('subprocess.call', return_value=0)
|
|
@unittest.mock.patch('subprocess.call', return_value=0)
|
|
@unittest.mock.patch('ninja.main', return_value=0)
|
|
@unittest.mock.patch('ninja.main', return_value=0)
|
|
@unittest.mock.patch('reclient_metrics.check_status', return_value=True)
|
|
@unittest.mock.patch('reclient_metrics.check_status', return_value=True)
|
|
@@ -171,6 +174,7 @@ expiry: {
|
|
os.environ.get('RBE_proxy_log_dir'),
|
|
os.environ.get('RBE_proxy_log_dir'),
|
|
os.path.join(self.root_dir, "out", "a", ".reproxy_tmp", "logs"))
|
|
os.path.join(self.root_dir, "out", "a", ".reproxy_tmp", "logs"))
|
|
self.assertEqual(os.environ.get('RBE_cache_dir'), cache_dir)
|
|
self.assertEqual(os.environ.get('RBE_cache_dir'), cache_dir)
|
|
|
|
+ self.assertIn("/SOME_RANDOM_ID", os.environ["RBE_invocation_id"])
|
|
if sys.platform.startswith('win'):
|
|
if sys.platform.startswith('win'):
|
|
self.assertEqual(
|
|
self.assertEqual(
|
|
os.environ.get('RBE_server_address'),
|
|
os.environ.get('RBE_server_address'),
|
|
@@ -214,7 +218,8 @@ expiry: {
|
|
]),
|
|
]),
|
|
])
|
|
])
|
|
|
|
|
|
- @unittest.mock.patch.dict(os.environ, {})
|
|
|
|
|
|
+ @unittest.mock.patch.dict(os.environ,
|
|
|
|
+ {'AUTONINJA_BUILD_ID': "SOME_RANDOM_ID"})
|
|
@unittest.mock.patch('subprocess.call', return_value=0)
|
|
@unittest.mock.patch('subprocess.call', return_value=0)
|
|
@unittest.mock.patch('ninja.main', return_value=0)
|
|
@unittest.mock.patch('ninja.main', return_value=0)
|
|
@unittest.mock.patch('reclient_metrics.check_status', return_value=True)
|
|
@unittest.mock.patch('reclient_metrics.check_status', return_value=True)
|
|
@@ -258,6 +263,7 @@ expiry: {
|
|
os.environ.get('RBE_proxy_log_dir'),
|
|
os.environ.get('RBE_proxy_log_dir'),
|
|
os.path.join(self.root_dir, "out", "a", ".reproxy_tmp", "logs"))
|
|
os.path.join(self.root_dir, "out", "a", ".reproxy_tmp", "logs"))
|
|
self.assertEqual(os.environ.get('RBE_cache_dir'), cache_dir)
|
|
self.assertEqual(os.environ.get('RBE_cache_dir'), cache_dir)
|
|
|
|
+ self.assertIn("/SOME_RANDOM_ID", os.environ["RBE_invocation_id"])
|
|
if sys.platform.startswith('win'):
|
|
if sys.platform.startswith('win'):
|
|
self.assertEqual(
|
|
self.assertEqual(
|
|
os.environ.get('RBE_server_address'),
|
|
os.environ.get('RBE_server_address'),
|