[beam] branch master updated: Fixing fileio tests for windows

[pa...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

pabloem pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git


The following commit(s) were added to refs/heads/master by this push:
     new 62bee7b  Fixing fileio tests for windows
     new 03ede84  Merge pull request #8460 from pabloem/fileio-win
62bee7b is described below

commit 62bee7bfa1c016e71245e7f69de12e092e5bdab4
Author: pabloem <pa...@apache.org>
AuthorDate: Wed May 1 17:15:19 2019 -0700

    Fixing fileio tests for windows
---
 sdks/python/apache_beam/io/fileio_test.py | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/sdks/python/apache_beam/io/fileio_test.py b/sdks/python/apache_beam/io/fileio_test.py
index 8963da1..63f855e 100644
--- a/sdks/python/apache_beam/io/fileio_test.py
+++ b/sdks/python/apache_beam/io/fileio_test.py
@@ -22,6 +22,7 @@ from __future__ import absolute_import
 import csv
 import io
 import logging
+import os
 import sys
 import unittest
 
@@ -40,7 +41,7 @@ class MatchTest(_TestCaseWithTempDirCleanUp):
 
   def test_basic_two_files(self):
     files = []
-    tempdir = '%s/' % self._new_tempdir()
+    tempdir = '%s%s' % (self._new_tempdir(), os.sep)
 
     # Create a couple files to be matched
     files.append(self._create_temp_file(dir=tempdir))
@@ -57,7 +58,7 @@ class MatchTest(_TestCaseWithTempDirCleanUp):
 
     for _ in range(2):
       # TODO: What about this having to append the ending slash?
-      d = '%s/' % self._new_tempdir()
+      d = '%s%s' % (self._new_tempdir(), os.sep)
       directories.append(d)
 
       files.append(self._create_temp_file(dir=d))
@@ -73,8 +74,8 @@ class MatchTest(_TestCaseWithTempDirCleanUp):
 
   def test_match_files_one_directory_failure(self):
     directories = [
-        '%s/' % self._new_tempdir(),
-        '%s/' % self._new_tempdir()]
+        '%s%s' % (self._new_tempdir(), os.sep),
+        '%s%s' % (self._new_tempdir(), os.sep)]
 
     files = list()
     files.append(self._create_temp_file(dir=directories[0]))
@@ -92,8 +93,8 @@ class MatchTest(_TestCaseWithTempDirCleanUp):
 
   def test_match_files_one_directory_failure(self):
     directories = [
-        '%s/' % self._new_tempdir(),
-        '%s/' % self._new_tempdir()]
+        '%s%s' % (self._new_tempdir(), os.sep),
+        '%s%s' % (self._new_tempdir(), os.sep)]
 
     files = list()
     files.append(self._create_temp_file(dir=directories[0]))
@@ -113,7 +114,7 @@ class ReadTest(_TestCaseWithTempDirCleanUp):
 
   def test_basic_file_name_provided(self):
     content = 'TestingMyContent\nIn multiple lines\nhaha!'
-    dir = '%s/' % self._new_tempdir()
+    dir = '%s%s' % (self._new_tempdir(), os.sep)
     self._create_temp_file(dir=dir, content=content)
 
     with TestPipeline() as p:
@@ -129,7 +130,7 @@ class ReadTest(_TestCaseWithTempDirCleanUp):
     content = 'name,year,place\ngoogle,1999,CA\nspotify,2006,sweden'
     rows = [r.split(',') for r in content.split('\n')]
 
-    dir = '%s/' % self._new_tempdir()
+    dir = '%s%s' % (self._new_tempdir(), os.sep)
     self._create_temp_file(dir=dir, content=content)
 
     def get_csv_reader(readable_file):
@@ -150,7 +151,7 @@ class ReadTest(_TestCaseWithTempDirCleanUp):
   def test_string_filenames_and_skip_directory(self):
     content = 'thecontent\n'
     files = []
-    tempdir = '%s/' % self._new_tempdir()
+    tempdir = '%s%s' % (self._new_tempdir(), os.sep)
 
     # Create a couple files to be matched
     files.append(self._create_temp_file(dir=tempdir, content=content))
@@ -167,7 +168,7 @@ class ReadTest(_TestCaseWithTempDirCleanUp):
   def test_fail_on_directories(self):
     content = 'thecontent\n'
     files = []
-    tempdir = '%s/' % self._new_tempdir()
+    tempdir = '%s%s' % (self._new_tempdir(), os.sep)
 
     # Create a couple files to be matched
     files.append(self._create_temp_file(dir=tempdir, content=content))