Skip to content

uploader: fix export when outdir has no slash #2847

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wchargin merged 1 commit into from
Oct 28, 2019
Merged

uploader: fix export when outdir has no slash #2847

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion tensorboard/uploader/exporter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,8 @@ def __init__(self, reader_service_client, output_directory):
self._api = reader_service_client
self._outdir = output_directory
parent_dir = os.path.dirname(self._outdir)
_mkdir_p(parent_dir)
if parent_dir:
_mkdir_p(parent_dir)
try:
os.mkdir(self._outdir)
except OSError as e:
Expand Down
19 changes: 19 additions & 0 deletions tensorboard/uploader/exporter_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,25 @@ def stream_experiments(request, **kwargs):
self.assertIn("../authorized_keys", msg)
mock_api_client.StreamExperimentData.assert_not_called()

def test_handles_outdir_with_no_slash(self):
oldcwd = os.getcwd()
try:
os.chdir(self.get_temp_dir())
mock_api_client = self._create_mock_api_client()
mock_api_client.StreamExperiments.return_value = iter([
export_service_pb2.StreamExperimentsResponse(experiment_ids=["123"]),
])
mock_api_client.StreamExperimentData.return_value = iter([
export_service_pb2.StreamExperimentDataResponse()
])

exporter = exporter_lib.TensorBoardExporter(mock_api_client, "outdir")
generator = exporter.export()
self.assertEqual(list(generator), ["123"])
self.assertTrue(os.path.isdir("outdir"))
finally:
os.chdir(oldcwd)

def test_rejects_existing_directory(self):
mock_api_client = self._create_mock_api_client()
outdir = os.path.join(self.get_temp_dir(), "outdir")
Expand Down