matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[sonic-config-engine] Ensure all test output files are ignored (#5197)

Browse Source 
Also align the naming and cleanup of generated output files in test_cfggen.py with the rest of the tests.
This commit is contained in:
Joe LeVeque 2020-08-15 23:09:11 -07:00 committed by GitHub
parent 547f0a6895
commit fa4af0d372
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/sonic-config-engine/.gitignore vendored
View File

@ -1,2 +1,3 @@
dist/ dist/
tests/output tests/output
tests/output2

21
src/sonic-config-engine/tests/test_cfggen.py
View File

@ -20,6 +20,15 @@ class TestCfgGen(TestCase):
self.sample_graph_bgp_speaker = os.path.join(self.test_dir, 't0-sample-bgp-speaker.xml') self.sample_graph_bgp_speaker = os.path.join(self.test_dir, 't0-sample-bgp-speaker.xml')
self.sample_device_desc = os.path.join(self.test_dir, 'device.xml') self.sample_device_desc = os.path.join(self.test_dir, 'device.xml')
self.port_config = os.path.join(self.test_dir, 't0-sample-port-config.ini') self.port_config = os.path.join(self.test_dir, 't0-sample-port-config.ini')
self.output_file = os.path.join(self.test_dir, 'output')
self.output2_file = os.path.join(self.test_dir, 'output2')
def tearDown(self):
try:
os.remove(self.output_file)
os.remove(self.output2_file)
except OSError:
pass
def run_script(self, argument, check_stderr=False): def run_script(self, argument, check_stderr=False):
print '\n Running sonic-cfggen ' + argument print '\n Running sonic-cfggen ' + argument
@ -111,14 +120,14 @@ class TestCfgGen(TestCase):
def test_template_batch_mode(self): def test_template_batch_mode(self):
argument = '-y ' + os.path.join(self.test_dir, 'test.yml') argument = '-y ' + os.path.join(self.test_dir, 'test.yml')
argument += ' -a \'{"key1":"value"}\'' argument += ' -a \'{"key1":"value"}\''
argument += ' -t ' + os.path.join(self.test_dir, 'test.j2') + ',' + os.path.join(self.test_dir, 'test.txt') argument += ' -t ' + os.path.join(self.test_dir, 'test.j2') + ',' + self.output_file
argument += ' -t ' + os.path.join(self.test_dir, 'test2.j2') + ',' + os.path.join(self.test_dir, 'test2.txt') argument += ' -t ' + os.path.join(self.test_dir, 'test2.j2') + ',' + self.output2_file
output = self.run_script(argument) output = self.run_script(argument)
assert(os.path.exists(os.path.join(self.test_dir, 'test.txt'))) assert(os.path.exists(self.output_file))
assert(os.path.exists(os.path.join(self.test_dir, 'test2.txt'))) assert(os.path.exists(self.output2_file))
with open(os.path.join(self.test_dir, 'test.txt')) as tf: with open(self.output_file) as tf:
self.assertEqual(tf.read().strip(), 'value1\nvalue2') self.assertEqual(tf.read().strip(), 'value1\nvalue2')
with open(os.path.join(self.test_dir, 'test2.txt')) as tf: with open(self.output2_file) as tf:
self.assertEqual(tf.read().strip(), 'value') self.assertEqual(tf.read().strip(), 'value')
def test_template_json_batch_mode(self): def test_template_json_batch_mode(self):