@@ -222,12 +222,12 @@ def _create_or_get_run_resource(
 location = m[2]
 tensorboard = m[3]
 experiment = m[4]
+if not run_name or run_name == ".":
+run_name = str(uuid.uuid4())
 experiment_run = experiment_run_resource.ExperimentRun.get(
 project=project, location=location, run_name=run_name
 )
 if not experiment_run:
-if not run_name:
-run_name = str(uuid.uuid4())
 experiment_run = experiment_run_resource.ExperimentRun.create(
 project=project,
 location=location,

@@ -665,7 +665,12 @@ def test_start_uploading_scalars(
 self.assertEqual(mock_tracker.blob_tracker.call_count, 0)
 
 @parameterized.parameters(
-{"existing_experiment": None}, {"existing_experiment": _TEST_EXPERIMENT_NAME}
+{"existing_experiment": None, "one_platform_run_name": None},
+{"existing_experiment": None, "one_platform_run_name": "."},
+{
+"existing_experiment": _TEST_EXPERIMENT_NAME,
+"one_platform_run_name": _TEST_ONE_PLATFORM_RUN_NAME,
+},
 )
 @.object(
 uploader_utils.OnePlatformResourceManager,
@@ -686,6 +691,7 @@ def test_start_uploading_scalars_one_shot(
 experiment_tracker_mock,
 run_resource_mock,
 existing_experiment,
+one_platform_run_name,
 ):
 """Check that one-shot uploading stops without AbortUploadError."""
 
@@ -734,7 +740,7 @@ def batch_create_time_series(parent, requests):
 
 mock_rate_limiter = mock.create_autospec(uploader_utils.RateLimiter)
 mock_tracker = mock.MagicMock()
-run_resource_mock.return_value = _TEST_ONE_PLATFORM_RUN_NAME
+run_resource_mock.return_value = one_platform_run_name
 with mock..object(
 upload_tracker, "UploadTracker", return_value=mock_tracker
 ):