Skip to content

Commit 4ca86d1

Browse files
author
Doug Greiman
committed
Use filecmp module instead of handrolled comparison
1 parent 6e4a63d commit 4ca86d1

2 files changed

Lines changed: 8 additions & 7 deletions

File tree

‎scripts/gen_dockerfile.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,10 @@ def get_app_config(raw_config, base_image, config_file, source_dir):
129129
entrypoint = validation_utils.get_field_value(raw_config, 'entrypoint', str)
130130
if not PRINTABLE_REGEX.match(entrypoint):
131131
raise ValueError('Invalid character in "entrypoint" field of app.yaml')
132+
132133
raw_runtime_config = validation_utils.get_field_value(raw_config, 'runtime_config', dict)
133134
python_version = validation_utils.get_field_value(raw_runtime_config, 'python_version', str)
135+
134136
dockerfile_python_version = PYTHON_INTERPRETER_VERSION_MAP.get(
135137
python_version)
136138
if dockerfile_python_version is None:

‎scripts/gen_dockerfile_test.py‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
"""Unit test for gen_dockerfile.py"""
1818

1919
import argparse
20+
import filecmp
2021
import os
2122
import re
2223
import shutil
@@ -40,13 +41,11 @@ def setUp(self):
4041

4142
def compare_file(self, filename, dir1, dir2):
4243
"""Compare identically named files in two different directories"""
43-
with open(os.path.join(dir1, filename), 'r', encoding='utf8') as file1:
44-
with open(os.path.join(dir2, filename), 'r', encoding='utf8') as file2:
45-
contents1 = file1.read()
46-
contents2 = file2.read()
47-
msg = 'Contents of "{}" differ between "{}" and "{}"'.format(
48-
filename, dir1, dir2)
49-
self.assertMultiLineEqual(contents1, contents2, msg)
44+
if not filecmp.cmp(os.path.join(dir1, filename),
45+
os.path.join(dir2, filename)):
46+
msg = 'Contents of "{}" differ between "{}" and "{}"'.format(
47+
filename, dir1, dir2)
48+
self.assertMultiLineEqual(contents1, contents2, msg)
5049

5150
def test_get_app_config(self):
5251
config_file = 'some_config_file'

0 commit comments

Comments
 (0)