Stone_Red/dvc
1
0
Fork 0
mirror of https://github.com/Stone-Red-Code/dvc.git synced 2026-11-02 07:18:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

test: use contents without \n

Browse Source 
Signed-off-by: Ruslan Kuprieiev <[email protected]>
This commit is contained in:
Ruslan Kuprieiev
2018-06-24 18:21:20 +03:00
parent 820bd89a6c
commit 0b29f8748f
2 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/basic_env.py
+2 -2
View File
@@ -16,9 +16,9 @@ class TestDir(TestCase):
DATA_CONTENTS = DATA
DATA_SUB_CONTENTS = DATA_SUB
FOO = 'foo'
FOO_CONTENTS = FOO + '\n'
FOO_CONTENTS = FOO
BAR = 'bar'
BAR_CONTENTS = BAR + '\n'
BAR_CONTENTS = BAR
CODE = 'code.py'
CODE_CONTENTS = 'import sys\nimport shutil\nshutil.copyfile(sys.argv[1], sys.argv[2])'
tests/test_repro.py
+25 -4
View File
@@ -387,7 +387,22 @@ class TestReproExternalHDFS(TestReproExternalBase):
stderr=PIPE)
p.communicate()
p = Popen('echo "{}" | HADOOP_USER_NAME=root hadoop fs -put - {}'.format(body.strip(), url),
p = Popen('HADOOP_USER_NAME=root hadoop fs -mkdir -p {}'.format(posixpath.dirname(url)),
shell=True,
executable=os.getenv('SHELL'),
stdin=PIPE,
stdout=PIPE,
stderr=PIPE)
out, err = p.communicate()
if p.returncode != 0:
print(out)
print(err)
self.assertEqual(p.returncode, 0)
with open('tmp', 'w+') as fd:
fd.write(body)
p = Popen('HADOOP_USER_NAME=root hadoop fs -copyFromLocal {} {}'.format('tmp', url),
shell=True,
executable=os.getenv('SHELL'),
stdin=PIPE,
@@ -438,16 +453,22 @@ class TestReproExternalSSH(TestReproExternalBase):
stdin=PIPE,
stdout=PIPE,
stderr=PIPE)
p.communicate()
out, err = p.communicate()
if p.returncode != 0:
print(out)
print(err)
self.assertEqual(p.returncode, 0)
p = Popen('echo "{}" | ssh {} "cat > {}"'.format(body.strip(), dest, path),
p = Popen('echo "{}" | ssh {} "tr -d \'\n\' > {}"'.format(body, dest, path),
shell=True,
executable=os.getenv('SHELL'),
stdin=PIPE,
stdout=PIPE,
stderr=PIPE)
p.communicate()
out, err = p.communicate()
if p.returncode != 0:
print(out)
print(err)
self.assertEqual(p.returncode, 0)